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/qmake5_paths.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/qmake5_paths.bbclass')
| -rw-r--r-- | classes/qmake5_paths.bbclass | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index e1101a9c..f3c7b112 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass | |||
| @@ -20,7 +20,6 @@ OE_QMAKE_PATH_DATA = "${datadir}" | |||
| 20 | OE_QMAKE_PATH_BINS = "${bindir}" | 20 | OE_QMAKE_PATH_BINS = "${bindir}" |
| 21 | OE_QMAKE_PATH_LIBEXECS = "${libdir}${QT_DIR_NAME}/libexec" | 21 | OE_QMAKE_PATH_LIBEXECS = "${libdir}${QT_DIR_NAME}/libexec" |
| 22 | OE_QMAKE_PATH_PLUGINS = "${libdir}${QT_DIR_NAME}/plugins" | 22 | OE_QMAKE_PATH_PLUGINS = "${libdir}${QT_DIR_NAME}/plugins" |
| 23 | OE_QMAKE_PATH_IMPORTS = "${libdir}${QT_DIR_NAME}/imports" | ||
| 24 | OE_QMAKE_PATH_QML = "${libdir}${QT_DIR_NAME}/qml" | 23 | OE_QMAKE_PATH_QML = "${libdir}${QT_DIR_NAME}/qml" |
| 25 | OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations" | 24 | OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations" |
| 26 | OE_QMAKE_PATH_DOCS = "${docdir}" | 25 | OE_QMAKE_PATH_DOCS = "${docdir}" |