diff options
author | Adam YH Lee <adam.yh.lee@gmail.com> | 2015-09-04 17:28:30 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-09-21 11:56:52 +0200 |
commit | 6f0dd9f7cb4166f22b78c0813819c636f6382e4f (patch) | |
tree | 4f179da50a054af9c93ea201f4173fc1a5d4160a | |
parent | 001ee936e9f4f3123a4f7b948bad111acdac740d (diff) | |
download | meta-qt5-6f0dd9f7cb4166f22b78c0813819c636f6382e4f.tar.gz |
Remove double slash when QT_DIR_NAME is empty
When `QT_DIR_NAME` is defined as an empty string (default is "qt5"),
package.bbclass will throw lots of QA warnings because now the paths contain
double slashes ("//").
We can address these warnings by explicitly defining a slash in the
variable itself.
Signed-off-by: Adam YH Lee <adam.yh.lee@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | classes/qmake5_base.bbclass | 2 | ||||
-rw-r--r-- | classes/qmake5_paths.bbclass | 38 | ||||
-rw-r--r-- | recipes-qt/maliit/maliit-framework-qt5_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/nativesdk-qtbase_git.bb | 8 | ||||
-rw-r--r-- | recipes-qt/qt5/qt5-creator_3.3.1.bb | 20 | ||||
-rw-r--r-- | recipes-qt/qt5/qtbase_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qtdeclarative_git.bb | 4 | ||||
-rw-r--r-- | recipes-qt/qt5/qttools_git.bb | 4 |
8 files changed, 42 insertions, 42 deletions
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass index d371ff38..9ebfa08e 100644 --- a/classes/qmake5_base.bbclass +++ b/classes/qmake5_base.bbclass | |||
@@ -32,7 +32,7 @@ EXTRA_OEMAKE = " \ | |||
32 | 32 | ||
33 | OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" | 33 | OE_QMAKESPEC = "${QMAKE_MKSPEC_PATH_NATIVE}/mkspecs/${OE_QMAKE_PLATFORM_NATIVE}" |
34 | OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" | 34 | OE_XQMAKESPEC = "${QMAKE_MKSPEC_PATH}/mkspecs/${OE_QMAKE_PLATFORM}" |
35 | OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" | 35 | OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" |
36 | OE_QMAKE_COMPILER = "${CC}" | 36 | OE_QMAKE_COMPILER = "${CC}" |
37 | OE_QMAKE_CC = "${CC}" | 37 | OE_QMAKE_CC = "${CC}" |
38 | OE_QMAKE_CFLAGS = "${CFLAGS}" | 38 | OE_QMAKE_CFLAGS = "${CFLAGS}" |
diff --git a/classes/qmake5_paths.bbclass b/classes/qmake5_paths.bbclass index c0310776..90e1789b 100644 --- a/classes/qmake5_paths.bbclass +++ b/classes/qmake5_paths.bbclass | |||
@@ -2,48 +2,48 @@ | |||
2 | # about conflicts with qt4, then you can add qmake5_paths.bbclass | 2 | # about conflicts with qt4, then you can add qmake5_paths.bbclass |
3 | # to your distro layer and flatten all QT_DIR_NAME directories | 3 | # to your distro layer and flatten all QT_DIR_NAME directories |
4 | 4 | ||
5 | QT_DIR_NAME ?= "qt5" | 5 | QT_DIR_NAME ?= "/qt5" |
6 | 6 | ||
7 | # This is useful for target recipes to reference native mkspecs | 7 | # This is useful for target recipes to reference native mkspecs |
8 | QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}/${QT_DIR_NAME}" | 8 | QMAKE_MKSPEC_PATH_NATIVE = "${STAGING_LIBDIR_NATIVE}${QT_DIR_NAME}" |
9 | QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}/${QT_DIR_NAME}" | 9 | QMAKE_MKSPEC_PATH_TARGET = "${STAGING_LIBDIR}${QT_DIR_NAME}" |
10 | 10 | ||
11 | QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}" | 11 | QMAKE_MKSPEC_PATH = "${QMAKE_MKSPEC_PATH_TARGET}" |
12 | QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" | 12 | QMAKE_MKSPEC_PATH_class-native = "${QMAKE_MKSPEC_PATH_NATIVE}" |
13 | QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}" | 13 | QMAKE_MKSPEC_PATH_class-nativesdk = "${QMAKE_MKSPEC_PATH_NATIVE}" |
14 | 14 | ||
15 | OE_QMAKE_PATH_PREFIX = "${prefix}" | 15 | OE_QMAKE_PATH_PREFIX = "${prefix}" |
16 | OE_QMAKE_PATH_HEADERS = "${includedir}/${QT_DIR_NAME}" | 16 | OE_QMAKE_PATH_HEADERS = "${includedir}${QT_DIR_NAME}" |
17 | OE_QMAKE_PATH_LIBS = "${libdir}" | 17 | OE_QMAKE_PATH_LIBS = "${libdir}" |
18 | OE_QMAKE_PATH_ARCHDATA = "${libdir}" | 18 | OE_QMAKE_PATH_ARCHDATA = "${libdir}" |
19 | OE_QMAKE_PATH_DATA = "${datadir}" | 19 | 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" | 23 | OE_QMAKE_PATH_IMPORTS = "${libdir}${QT_DIR_NAME}/imports" |
24 | OE_QMAKE_PATH_QML = "${libdir}/${QT_DIR_NAME}/qml" | 24 | OE_QMAKE_PATH_QML = "${libdir}${QT_DIR_NAME}/qml" |
25 | OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations" | 25 | OE_QMAKE_PATH_TRANSLATIONS = "${datadir}/translations" |
26 | OE_QMAKE_PATH_DOCS = "${docdir}" | 26 | OE_QMAKE_PATH_DOCS = "${docdir}" |
27 | OE_QMAKE_PATH_SETTINGS = "${sysconfdir}" | 27 | OE_QMAKE_PATH_SETTINGS = "${sysconfdir}" |
28 | OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples" | 28 | OE_QMAKE_PATH_EXAMPLES = "${datadir}/examples" |
29 | OE_QMAKE_PATH_TESTS = "${datadir}/tests" | 29 | OE_QMAKE_PATH_TESTS = "${datadir}/tests" |
30 | OE_QMAKE_PATH_HOST_PREFIX = "" | 30 | OE_QMAKE_PATH_HOST_PREFIX = "" |
31 | OE_QMAKE_PATH_HOST_BINS = "${bindir}/${QT_DIR_NAME}" | 31 | OE_QMAKE_PATH_HOST_BINS = "${bindir}${QT_DIR_NAME}" |
32 | OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" | 32 | OE_QMAKE_PATH_HOST_DATA = "${QMAKE_MKSPEC_PATH_TARGET}" |
33 | OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}" | 33 | OE_QMAKE_PATH_HOST_LIBS = "${STAGING_LIBDIR}" |
34 | OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}" | 34 | OE_QMAKE_PATH_EXTERNAL_HOST_BINS = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}" |
35 | 35 | ||
36 | # for qt5 components we're using QT_DIR_NAME subdirectory in more | 36 | # for qt5 components we're using QT_DIR_NAME subdirectory in more |
37 | # variables, because we don't want conflicts with qt4 | 37 | # variables, because we don't want conflicts with qt4 |
38 | # This block is usefull for components which install their | 38 | # This block is usefull for components which install their |
39 | # own files without QT_DIR_NAME but need to reference paths e.g. | 39 | # own files without QT_DIR_NAME but need to reference paths e.g. |
40 | # with QT headers | 40 | # with QT headers |
41 | OE_QMAKE_PATH_QT_HEADERS = "${includedir}/${QT_DIR_NAME}" | 41 | OE_QMAKE_PATH_QT_HEADERS = "${includedir}${QT_DIR_NAME}" |
42 | OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}/${QT_DIR_NAME}" | 42 | OE_QMAKE_PATH_QT_ARCHDATA = "${libdir}${QT_DIR_NAME}" |
43 | OE_QMAKE_PATH_QT_DATA = "${datadir}/${QT_DIR_NAME}" | 43 | OE_QMAKE_PATH_QT_DATA = "${datadir}${QT_DIR_NAME}" |
44 | OE_QMAKE_PATH_QT_BINS = "${bindir}/${QT_DIR_NAME}" | 44 | OE_QMAKE_PATH_QT_BINS = "${bindir}${QT_DIR_NAME}" |
45 | OE_QMAKE_PATH_QT_TRANSLATIONS = "${datadir}/${QT_DIR_NAME}/translations" | 45 | OE_QMAKE_PATH_QT_TRANSLATIONS = "${datadir}${QT_DIR_NAME}/translations" |
46 | OE_QMAKE_PATH_QT_DOCS = "${docdir}/${QT_DIR_NAME}" | 46 | OE_QMAKE_PATH_QT_DOCS = "${docdir}${QT_DIR_NAME}" |
47 | OE_QMAKE_PATH_QT_SETTINGS = "${sysconfdir}/${QT_DIR_NAME}" | 47 | OE_QMAKE_PATH_QT_SETTINGS = "${sysconfdir}${QT_DIR_NAME}" |
48 | OE_QMAKE_PATH_QT_EXAMPLES = "${datadir}/${QT_DIR_NAME}/examples" | 48 | OE_QMAKE_PATH_QT_EXAMPLES = "${datadir}${QT_DIR_NAME}/examples" |
49 | OE_QMAKE_PATH_QT_TESTS = "${datadir}/${QT_DIR_NAME}/tests" | 49 | OE_QMAKE_PATH_QT_TESTS = "${datadir}${QT_DIR_NAME}/tests" |
diff --git a/recipes-qt/maliit/maliit-framework-qt5_git.bb b/recipes-qt/maliit/maliit-framework-qt5_git.bb index 490670d9..83da8cad 100644 --- a/recipes-qt/maliit/maliit-framework-qt5_git.bb +++ b/recipes-qt/maliit/maliit-framework-qt5_git.bb | |||
@@ -63,8 +63,8 @@ EXTRA_OEMAKE += "INSTALL_ROOT=${D}" | |||
63 | 63 | ||
64 | do_install_append() { | 64 | do_install_append() { |
65 | #Fix absolute paths | 65 | #Fix absolute paths |
66 | sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-framework.prf | 66 | sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}${QT_DIR_NAME}/mkspecs/features/maliit-framework.prf |
67 | sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}/${QT_DIR_NAME}/mkspecs/features/maliit-plugins.prf | 67 | sed -i -e "s|/usr|${STAGING_DIR_TARGET}${prefix}|" ${D}/${libdir}${QT_DIR_NAME}/mkspecs/features/maliit-plugins.prf |
68 | 68 | ||
69 | install -d ${D}${datadir}/applications | 69 | install -d ${D}${datadir}/applications |
70 | install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications | 70 | install -m 644 ${WORKDIR}/maliit-server.desktop ${D}${datadir}/applications |
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb b/recipes-qt/qt5/nativesdk-qtbase_git.bb index 9fe45543..69e2b3bc 100644 --- a/recipes-qt/qt5/nativesdk-qtbase_git.bb +++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb | |||
@@ -89,7 +89,7 @@ QT_CONFIG_FLAGS += " \ | |||
89 | " | 89 | " |
90 | 90 | ||
91 | # qtbase is exception, as these are used as install path for sysroots | 91 | # qtbase is exception, as these are used as install path for sysroots |
92 | OE_QMAKE_PATH_HOST_DATA = "${libdir}/${QT_DIR_NAME}" | 92 | OE_QMAKE_PATH_HOST_DATA = "${libdir}${QT_DIR_NAME}" |
93 | OE_QMAKE_PATH_HOST_LIBS = "${libdir}" | 93 | OE_QMAKE_PATH_HOST_LIBS = "${libdir}" |
94 | 94 | ||
95 | do_generate_qt_config_file() { | 95 | do_generate_qt_config_file() { |
@@ -143,7 +143,7 @@ export OE_QMAKE_AR | |||
143 | export OE_QMAKE_STRIP | 143 | export OE_QMAKE_STRIP |
144 | 144 | ||
145 | # another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location | 145 | # another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location |
146 | OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" | 146 | OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" |
147 | OE_QMAKE_QMAKE = "bin/qmake" | 147 | OE_QMAKE_QMAKE = "bin/qmake" |
148 | 148 | ||
149 | do_configure() { | 149 | do_configure() { |
@@ -268,9 +268,9 @@ do_generate_qt_environment_file() { | |||
268 | echo 'export OE_QMAKE_RCC=${OE_QMAKE_PATH_HOST_BINS}/rcc' >> $script | 268 | echo 'export OE_QMAKE_RCC=${OE_QMAKE_PATH_HOST_BINS}/rcc' >> $script |
269 | echo 'export OE_QMAKE_QDBUSCPP2XML=${OE_QMAKE_PATH_HOST_BINS}/qdbuscpp2xml' >> $script | 269 | echo 'export OE_QMAKE_QDBUSCPP2XML=${OE_QMAKE_PATH_HOST_BINS}/qdbuscpp2xml' >> $script |
270 | echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script | 270 | echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script |
271 | echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script | 271 | echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script |
272 | echo 'export OE_QMAKE_PATH_HOST_BINS=${OE_QMAKE_PATH_HOST_BINS}' >> $script | 272 | echo 'export OE_QMAKE_PATH_HOST_BINS=${OE_QMAKE_PATH_HOST_BINS}' >> $script |
273 | echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/linux-oe-g++' >> $script | 273 | echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`${QT_DIR_NAME}/mkspecs/linux-oe-g++' >> $script |
274 | 274 | ||
275 | # Use relocable sysroot | 275 | # Use relocable sysroot |
276 | sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script | 276 | sed -i -e 's:${SDKPATHNATIVE}:$OECORE_NATIVE_SYSROOT:g' $script |
diff --git a/recipes-qt/qt5/qt5-creator_3.3.1.bb b/recipes-qt/qt5/qt5-creator_3.3.1.bb index 97ca450e..48e65bb5 100644 --- a/recipes-qt/qt5/qt5-creator_3.3.1.bb +++ b/recipes-qt/qt5/qt5-creator_3.3.1.bb | |||
@@ -28,7 +28,7 @@ SRC_URI[sha256sum] = "afefb73a05cdc36cdfb8a760c2b39eb6c366a22ef47c7d365d446092dd | |||
28 | 28 | ||
29 | S = "${WORKDIR}/qt-creator-opensource-src-${PV}" | 29 | S = "${WORKDIR}/qt-creator-opensource-src-${PV}" |
30 | 30 | ||
31 | EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}/${QT_DIR_NAME}" | 31 | EXTRA_QMAKEVARS_PRE += "IDE_LIBRARY_BASENAME=${baselib}${QT_DIR_NAME}" |
32 | 32 | ||
33 | do_configure_prepend() { | 33 | do_configure_prepend() { |
34 | # causes gcc infinite loop with 4.9.x for arm targets similar to | 34 | # causes gcc infinite loop with 4.9.x for arm targets similar to |
@@ -38,11 +38,11 @@ do_configure_prepend() { | |||
38 | 38 | ||
39 | do_configure_append() { | 39 | do_configure_append() { |
40 | # Find native tools | 40 | # Find native tools |
41 | sed -i 's:${STAGING_BINDIR}.*/lrelease:${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/lrelease:g' ${B}/share/qtcreator/translations/Makefile | 41 | sed -i 's:${STAGING_BINDIR}.*/lrelease:${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/lrelease:g' ${B}/share/qtcreator/translations/Makefile |
42 | sed -i 's:${STAGING_BINDIR}.*/qdoc:${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qdoc:g' ${B}/Makefile | 42 | sed -i 's:${STAGING_BINDIR}.*/qdoc:${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qdoc:g' ${B}/Makefile |
43 | 43 | ||
44 | # see qtbase-native.inc | 44 | # see qtbase-native.inc |
45 | # sed -i 's:QT_INSTALL_DOCS=${docdir}:QT_INSTALL_DOCS=${STAGING_DATADIR_NATIVE}/${QT_DIR_NAME}/doc:g' ${B}/Makefile | 45 | # sed -i 's:QT_INSTALL_DOCS=${docdir}:QT_INSTALL_DOCS=${STAGING_DATADIR_NATIVE}${QT_DIR_NAME}/doc:g' ${B}/Makefile |
46 | } | 46 | } |
47 | 47 | ||
48 | do_compile_append() { | 48 | do_compile_append() { |
@@ -56,22 +56,22 @@ do_install() { | |||
56 | # install desktop and ensure that qt-creator finds qmake | 56 | # install desktop and ensure that qt-creator finds qmake |
57 | install -d ${D}${datadir}/applications | 57 | install -d ${D}${datadir}/applications |
58 | install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop | 58 | install -m 0644 ${WORKDIR}/qtcreator.desktop.in ${D}${datadir}/applications/qtcreator.desktop |
59 | sed -i 's:@QT5_QMAKE@:${bindir}/${QT_DIR_NAME}:g' ${D}${datadir}/applications/qtcreator.desktop | 59 | sed -i 's:@QT5_QMAKE@:${bindir}${QT_DIR_NAME}:g' ${D}${datadir}/applications/qtcreator.desktop |
60 | } | 60 | } |
61 | 61 | ||
62 | FILES_${PN} += " \ | 62 | FILES_${PN} += " \ |
63 | ${datadir}/qtcreator \ | 63 | ${datadir}/qtcreator \ |
64 | ${datadir}/icons \ | 64 | ${datadir}/icons \ |
65 | ${libdir}/${QT_DIR_NAME}/qtcreator \ | 65 | ${libdir}${QT_DIR_NAME}/qtcreator \ |
66 | " | 66 | " |
67 | FILES_${PN}-dbg += " \ | 67 | FILES_${PN}-dbg += " \ |
68 | ${libdir}/${QT_DIR_NAME}/qtcreator/.debug \ | 68 | ${libdir}${QT_DIR_NAME}/qtcreator/.debug \ |
69 | ${libdir}/${QT_DIR_NAME}/qtcreator/plugins/.debug \ | 69 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/.debug \ |
70 | ${libdir}/${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \ | 70 | ${libdir}${QT_DIR_NAME}/qtcreator/plugins/qbs/plugins/.debug \ |
71 | " | 71 | " |
72 | 72 | ||
73 | FILES_${PN}-dev += " \ | 73 | FILES_${PN}-dev += " \ |
74 | ${libdir}/${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ | 74 | ${libdir}${QT_DIR_NAME}/qtcreator/*${SOLIBSDEV} \ |
75 | " | 75 | " |
76 | 76 | ||
77 | RDEPENDS_${PN} += "perl" | 77 | RDEPENDS_${PN} += "perl" |
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 087ebf35..70e35c23 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb | |||
@@ -154,7 +154,7 @@ EOF | |||
154 | QMAKE_MKSPEC_PATH = "${B}" | 154 | QMAKE_MKSPEC_PATH = "${B}" |
155 | 155 | ||
156 | # another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location | 156 | # another exception is that we need to run bin/qmake, because EffectivePaths are relative to qmake location |
157 | OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/qmake" | 157 | OE_QMAKE_QMAKE_ORIG = "${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/qmake" |
158 | OE_QMAKE_QMAKE = "bin/qmake" | 158 | OE_QMAKE_QMAKE = "bin/qmake" |
159 | 159 | ||
160 | # qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell | 160 | # qtbase is exception, configure script is using our get(X)QEvalMakeConf and setBootstrapEvalVariable functions to read it from shell |
@@ -219,7 +219,7 @@ do_compile_append() { | |||
219 | } | 219 | } |
220 | 220 | ||
221 | do_install_append() { | 221 | do_install_append() { |
222 | install -m 0755 ${B}/qmake/bin/qmake ${D}/${bindir}/${QT_DIR_NAME} | 222 | install -m 0755 ${B}/qmake/bin/qmake ${D}/${bindir}${QT_DIR_NAME} |
223 | 223 | ||
224 | ### Fix up the binaries to the right location | 224 | ### Fix up the binaries to the right location |
225 | ### TODO: FIX | 225 | ### TODO: FIX |
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb index 15d176b9..105c9cde 100644 --- a/recipes-qt/qt5/qtdeclarative_git.bb +++ b/recipes-qt/qt5/qtdeclarative_git.bb | |||
@@ -16,7 +16,7 @@ SRC_URI += " \ | |||
16 | file://0001-qmltestexample-fix-link.patch \ | 16 | file://0001-qmltestexample-fix-link.patch \ |
17 | " | 17 | " |
18 | 18 | ||
19 | EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/syncqt" | 19 | EXTRA_OEMAKE += "QMAKE_SYNCQT=${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt" |
20 | 20 | ||
21 | PACKAGECONFIG ??= "qtxmlpatterns" | 21 | PACKAGECONFIG ??= "qtxmlpatterns" |
22 | PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" | 22 | PACKAGECONFIG[qtxmlpatterns] = ",,qtxmlpatterns" |
@@ -27,7 +27,7 @@ do_configure_prepend() { | |||
27 | sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro | 27 | sed -e 's/^\(!qtHaveModule(xmlpatterns)\)/!OE_QTXMLPATTERNS_ENABLED|\1/' -i ${S}/tests/auto/quick/quick.pro |
28 | 28 | ||
29 | #set the path for syncqt properly | 29 | #set the path for syncqt properly |
30 | echo "QT_TOOL.syncqt.binary = \"${STAGING_BINDIR_NATIVE}/${QT_DIR_NAME}/syncqt\"" > ${B}/.qmake.cache | 30 | echo "QT_TOOL.syncqt.binary = \"${STAGING_BINDIR_NATIVE}${QT_DIR_NAME}/syncqt\"" > ${B}/.qmake.cache |
31 | } | 31 | } |
32 | 32 | ||
33 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" | 33 | EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns', 'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}" |
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb index fff2a746..5651f568 100644 --- a/recipes-qt/qt5/qttools_git.bb +++ b/recipes-qt/qt5/qttools_git.bb | |||
@@ -18,8 +18,8 @@ SRC_URI += " \ | |||
18 | file://0003-add-noqtwebkit-configuration.patch \ | 18 | file://0003-add-noqtwebkit-configuration.patch \ |
19 | " | 19 | " |
20 | 20 | ||
21 | FILES_${PN}-tools += "${datadir}/${QT_DIR_NAME}/phrasebooks" | 21 | FILES_${PN}-tools += "${datadir}${QT_DIR_NAME}/phrasebooks" |
22 | FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples" | 22 | FILES_${PN}-examples = "${datadir}${QT_DIR_NAME}/examples" |
23 | 23 | ||
24 | PACKAGECONFIG ??= "" | 24 | PACKAGECONFIG ??= "" |
25 | PACKAGECONFIG_class-native ??= "linguistonly" | 25 | PACKAGECONFIG_class-native ??= "linguistonly" |