diff options
| author | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-05 10:03:27 +0300 |
|---|---|---|
| committer | Samuli Piippo <samuli.piippo@qt.io> | 2018-07-05 10:03:27 +0300 |
| commit | fe1bc76ad4cc4e114a639ca94716cfd24f0b5ad5 (patch) | |
| tree | d007fed4c6c9f33c41573550e76fc325b040b59b /classes/populate_sdk_qt5_base.bbclass | |
| parent | 0ab7116f9cbb93b3132481731db296245044fbff (diff) | |
| parent | 0263af75c053d1d7ea4882a75cf59b230fbb88ad (diff) | |
| download | meta-qt5-fe1bc76ad4cc4e114a639ca94716cfd24f0b5ad5.tar.gz | |
Merge remote-tracking branch 'qtyocto/upstream/master' into 5.11
* qtyocto/upstream/master:
qt5: add option to build Qt5 statically
qtbase: fix install locations used in static builds
qttranslations: do not use qt meta catalog translation package
qttools: Disable clang support
qtbase: add PACKAGECONFIG for Link Time Optimization
qt5: remove all references to qtquick1 import path
qt5/qtscript: Fix qtscript cross compile error
README: Add Yocto Project Compatible badge and fix formatting
Change-Id: Ic8cb74f6e87634b26f79c9effffb80deb6a51b6b
Diffstat (limited to 'classes/populate_sdk_qt5_base.bbclass')
| -rw-r--r-- | classes/populate_sdk_qt5_base.bbclass | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/classes/populate_sdk_qt5_base.bbclass b/classes/populate_sdk_qt5_base.bbclass index b6ce5967..c26fee44 100644 --- a/classes/populate_sdk_qt5_base.bbclass +++ b/classes/populate_sdk_qt5_base.bbclass | |||
| @@ -14,7 +14,6 @@ create_sdk_files_prepend () { | |||
| 14 | echo 'Binaries = ${OE_QMAKE_PATH_QT_BINS}' >> $qtconf | 14 | echo 'Binaries = ${OE_QMAKE_PATH_QT_BINS}' >> $qtconf |
| 15 | echo 'LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}' >> $qtconf | 15 | echo 'LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}' >> $qtconf |
| 16 | echo 'Plugins = ${OE_QMAKE_PATH_PLUGINS}' >> $qtconf | 16 | echo 'Plugins = ${OE_QMAKE_PATH_PLUGINS}' >> $qtconf |
| 17 | echo 'Imports = ${OE_QMAKE_PATH_IMPORTS}' >> $qtconf | ||
| 18 | echo 'Qml2Imports = ${OE_QMAKE_PATH_QML}' >> $qtconf | 17 | echo 'Qml2Imports = ${OE_QMAKE_PATH_QML}' >> $qtconf |
| 19 | echo 'Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS}' >> $qtconf | 18 | echo 'Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS}' >> $qtconf |
| 20 | echo 'Documentation = ${OE_QMAKE_PATH_QT_DOCS}' >> $qtconf | 19 | echo 'Documentation = ${OE_QMAKE_PATH_QT_DOCS}' >> $qtconf |