summaryrefslogtreecommitdiffstats
path: root/classes
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2018-06-27 15:59:29 +0300
committerOtavio Salvador <otavio@ossystems.com.br>2018-07-03 15:00:57 -0300
commit7faa5d8f39381975a861e3e918789e9f33a079f6 (patch)
tree0bfe7de30cec3da0079c1c0885ac6f16a314b43e /classes
parent65c85d36407edb113b1b6d40bf7d8966a7651ea4 (diff)
downloadmeta-qt5-7faa5d8f39381975a861e3e918789e9f33a079f6.tar.gz
qt5: remove all references to qtquick1 import path
Since qtquick1 recipes have been removed, there is no need to have OE_QMAKE_PATH_IMPORTS anymore. Signed-off-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'classes')
-rw-r--r--classes/cmake_qt5.bbclass1
-rw-r--r--classes/populate_sdk_qt5_base.bbclass1
-rw-r--r--classes/qmake5_base.bbclass2
-rw-r--r--classes/qmake5_paths.bbclass1
4 files changed, 0 insertions, 5 deletions
diff --git a/classes/cmake_qt5.bbclass b/classes/cmake_qt5.bbclass
index 5d605a68..5ba960ec 100644
--- a/classes/cmake_qt5.bbclass
+++ b/classes/cmake_qt5.bbclass
@@ -12,7 +12,6 @@ EXTRA_OECMAKE_prepend = " \
12 -DOE_QMAKE_PATH_BINS=${OE_QMAKE_PATH_BINS} \ 12 -DOE_QMAKE_PATH_BINS=${OE_QMAKE_PATH_BINS} \
13 -DOE_QMAKE_PATH_LIBEXECS=${OE_QMAKE_PATH_LIBEXECS} \ 13 -DOE_QMAKE_PATH_LIBEXECS=${OE_QMAKE_PATH_LIBEXECS} \
14 -DOE_QMAKE_PATH_PLUGINS=${OE_QMAKE_PATH_PLUGINS} \ 14 -DOE_QMAKE_PATH_PLUGINS=${OE_QMAKE_PATH_PLUGINS} \
15 -DOE_QMAKE_PATH_IMPORTS=${OE_QMAKE_PATH_IMPORTS} \
16 -DOE_QMAKE_PATH_QML=${OE_QMAKE_PATH_QML} \ 15 -DOE_QMAKE_PATH_QML=${OE_QMAKE_PATH_QML} \
17 -DOE_QMAKE_PATH_TRANSLATIONS=${OE_QMAKE_PATH_TRANSLATIONS} \ 16 -DOE_QMAKE_PATH_TRANSLATIONS=${OE_QMAKE_PATH_TRANSLATIONS} \
18 -DOE_QMAKE_PATH_DOCS=${OE_QMAKE_PATH_DOCS} \ 17 -DOE_QMAKE_PATH_DOCS=${OE_QMAKE_PATH_DOCS} \
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
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 8f1d143a..b3a4826a 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -60,7 +60,6 @@ Data = ${OE_QMAKE_PATH_DATA}
60Binaries = ${OE_QMAKE_PATH_BINS} 60Binaries = ${OE_QMAKE_PATH_BINS}
61LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS} 61LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
62Plugins = ${OE_QMAKE_PATH_PLUGINS} 62Plugins = ${OE_QMAKE_PATH_PLUGINS}
63Imports = ${OE_QMAKE_PATH_IMPORTS}
64Qml2Imports = ${OE_QMAKE_PATH_QML} 63Qml2Imports = ${OE_QMAKE_PATH_QML}
65Translations = ${OE_QMAKE_PATH_TRANSLATIONS} 64Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
66Documentation = ${OE_QMAKE_PATH_DOCS} 65Documentation = ${OE_QMAKE_PATH_DOCS}
@@ -93,7 +92,6 @@ Data = ${OE_QMAKE_PATH_DATA}
93Binaries = ${OE_QMAKE_PATH_BINS} 92Binaries = ${OE_QMAKE_PATH_BINS}
94LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS} 93LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}
95Plugins = ${OE_QMAKE_PATH_PLUGINS} 94Plugins = ${OE_QMAKE_PATH_PLUGINS}
96Imports = ${OE_QMAKE_PATH_IMPORTS}
97Qml2Imports = ${OE_QMAKE_PATH_QML} 95Qml2Imports = ${OE_QMAKE_PATH_QML}
98Translations = ${OE_QMAKE_PATH_TRANSLATIONS} 96Translations = ${OE_QMAKE_PATH_TRANSLATIONS}
99Documentation = ${OE_QMAKE_PATH_DOCS} 97Documentation = ${OE_QMAKE_PATH_DOCS}
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}"
20OE_QMAKE_PATH_BINS = "${bindir}" 20OE_QMAKE_PATH_BINS = "${bindir}"
21OE_QMAKE_PATH_LIBEXECS = "${libdir}${QT_DIR_NAME}/libexec" 21OE_QMAKE_PATH_LIBEXECS = "${libdir}${QT_DIR_NAME}/libexec"
22OE_QMAKE_PATH_PLUGINS = "${libdir}${QT_DIR_NAME}/plugins" 22OE_QMAKE_PATH_PLUGINS = "${libdir}${QT_DIR_NAME}/plugins"
23OE_QMAKE_PATH_IMPORTS = "${libdir}${QT_DIR_NAME}/imports"
24OE_QMAKE_PATH_QML = "${libdir}${QT_DIR_NAME}/qml" 23OE_QMAKE_PATH_QML = "${libdir}${QT_DIR_NAME}/qml"
25OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations" 24OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations"
26OE_QMAKE_PATH_DOCS = "${docdir}" 25OE_QMAKE_PATH_DOCS = "${docdir}"