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 /recipes-qt/qt5/nativesdk-qtbase_git.bb | |
| 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 'recipes-qt/qt5/nativesdk-qtbase_git.bb')
| -rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 6ee5334a..ddca5bf9 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
| @@ -140,7 +140,6 @@ do_configure() { | |||
| 140 | -archdatadir ${OE_QMAKE_PATH_ARCHDATA} \ | 140 | -archdatadir ${OE_QMAKE_PATH_ARCHDATA} \ |
| 141 | -libexecdir ${OE_QMAKE_PATH_LIBEXECS} \ | 141 | -libexecdir ${OE_QMAKE_PATH_LIBEXECS} \ |
| 142 | -plugindir ${OE_QMAKE_PATH_PLUGINS} \ | 142 | -plugindir ${OE_QMAKE_PATH_PLUGINS} \ |
| 143 | -importdir ${OE_QMAKE_PATH_IMPORTS} \ | ||
| 144 | -qmldir ${OE_QMAKE_PATH_QML} \ | 143 | -qmldir ${OE_QMAKE_PATH_QML} \ |
| 145 | -translationdir ${OE_QMAKE_PATH_TRANSLATIONS} \ | 144 | -translationdir ${OE_QMAKE_PATH_TRANSLATIONS} \ |
| 146 | -testsdir ${OE_QMAKE_PATH_TESTS} \ | 145 | -testsdir ${OE_QMAKE_PATH_TESTS} \ |