[oe] [meta-qt5][PATCH 08/11] qtbase: remove dependency to sqlite
Qt defaults to bundled version of sqlite, so there is no need to have dependency to sqlite3. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 92faf29..972027b 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -101,7 +101,7 @@ PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci" PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds" PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite" -PACKAGECONFIG[sql-sqlite] = "-sql-sqlite,-no-sql-sqlite,sqlite3" +PACKAGECONFIG[sql-sqlite] = "-sql-sqlite,-no-sql-sqlite," PACKAGECONFIG[xcursor] = "-xcursor,-no-xcursor,libxcursor" PACKAGECONFIG[xinerama] = "-xinerama,-no-xinerama,libxinerama" PACKAGECONFIG[xinput] = "-xinput,-no-xinput" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 11/11] qtwebengine: fix problem with recursive qmake call
On RaspberryPi, the EGL include paths were not included in the generated
ninja build files, because the pro files were run in wrong order. Fix the
order, but remove compiler overrides, as they would break the build again.
Signed-off-by: Samuli Piippo
---
.../0005-Generate-usable-qmake_extras.gypi.patch | 71 ++
recipes-qt/qt5/qtwebengine_git.bb | 1 +
2 files changed, 72 insertions(+)
create mode 100644
recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch
diff --git
a/recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch
b/recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch
new file mode 100644
index 000..89f56e0
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch
@@ -0,0 +1,71 @@
+From 9d2fafdd9a15adf51d8383bdd545d73e76ad0428 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo
+Date: Mon, 11 May 2015 13:47:06 +0300
+Subject: [PATCH] Generate usable qmake_extras.gypi
+
+Running qmake recursively does not take .depends into account, so
+the SUBDIRS need to be in correct order so that qmake_extras.gypi
+is used for the ninja files. Do no try to write compiler tools as
+it will break the build.
+
+Task-number: QTBUG-45706
+Upstream-Status: Pending
+---
+ src/core/core.pro | 7 ---
+ src/core/gyp_configure_host.pro | 3 ---
+ src/core/gyp_configure_target.pro | 3 ---
+ 3 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/src/core/core.pro b/src/core/core.pro
+index cf00f39..747b711 100644
+--- a/src/core/core.pro
b/src/core/core.pro
+@@ -12,9 +12,7 @@ gyp_run.depends = core_gyp_generator
+ core_module.file = core_module.pro
+ core_module.depends = gyp_run
+
+-SUBDIRS += core_gyp_generator \
+- gyp_run \
+- core_module
++SUBDIRS += core_gyp_generator
+
+ !win32 {
+ # gyp_configure_host.pro and gyp_configure_target.pro are phony pro files
that
+@@ -28,3 +26,6 @@ SUBDIRS += core_gyp_generator \
+ gyp_run.depends += gyp_configure_host gyp_configure_target
+ SUBDIRS += gyp_configure_host gyp_configure_target
+ }
++
++SUBDIRS += gyp_run \
++ core_module
+diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro
+index 3eb6738..d6820c4 100644
+--- a/src/core/gyp_configure_host.pro
b/src/core/gyp_configure_host.pro
+@@ -6,9 +6,6 @@ option(host_build)
+
+ GYPI_CONTENTS = "{" \
+ " 'make_global_settings': [" \
+-"['CC.host', '$$which($$QMAKE_CC)']," \
+-"['CXX.host', '$$which($$QMAKE_CXX)']," \
+-"['LD.host', '$$which($$QMAKE_LINK)'],"
+
+ GYPI_FILE = $$absolute_path('qmake_extras.gypi')
+ !build_pass {
+diff --git a/src/core/gyp_configure_target.pro
b/src/core/gyp_configure_target.pro
+index 4d52044..f02bfa0 100644
+--- a/src/core/gyp_configure_target.pro
b/src/core/gyp_configure_target.pro
+@@ -3,9 +3,6 @@ TEMPLATE = aux
+
+ TOOLCHAIN_INCLUDES = $${QMAKE_INCDIR_EGL} $${INCLUDEPATH} $${QMAKE_INCDIR}
+
+-GYPI_CONTENTS += "['CC', '$$which($$QMAKE_CC)']," \
+- "['CXX', '$$which($$QMAKE_CXX)']," \
+- "['LD', '$$which($$QMAKE_LINK)'],"
+ GYPI_CONTENTS += " ]," \
+ " 'target_defaults': {" \
+ "'target_conditions': [" \
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtwebengine_git.bb
b/recipes-qt/qt5/qtwebengine_git.bb
index 3bd75af..659fb56 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -80,6 +80,7 @@ SRC_URI += " \
file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
+file://0005-Generate-usable-qmake_extras.gypi.patch \
"
SRCREV_qtwebengine = "55a7fc7651136510032166ff24eb5e7e49635145"
SRCREV_chromium = "140893bef70011645c686f5fabe45018dd2e392a"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 09/11] qtbase: PACKAGECONFIGs for libproxy and libinput
Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 972027b..dcda92f 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -133,6 +133,8 @@ PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" PACKAGECONFIG[nis] = "-nis,-no-nis" PACKAGECONFIG[widgets] = "-widgets,-no-widgets" +PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" +PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" QT_CONFIG_FLAGS += " \ -shared \ -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 01/11] qt5: make populate_sdk_qt5 reusable
Move task definitions from populate_sdk_qt5.bbclass to the toolchain recipe,
so that populate_sdk_qt5 can be reused in different toolchain meta recipes.
Signed-off-by: Samuli Piippo
---
classes/populate_sdk_qt5.bbclass | 5 -
recipes-qt/meta/meta-toolchain-qt5.bb | 4
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass
index 79df489..d29ec36 100644
--- a/classes/populate_sdk_qt5.bbclass
+++ b/classes/populate_sdk_qt5.bbclass
@@ -1,8 +1,5 @@
# Copyright (C) 2014 O.S. Systems Software LTDA.
-TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
-TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target"
-
# This allow reuse of Qt paths
inherit qmake5_paths
@@ -33,5 +30,3 @@ create_sdk_files_prepend () {
echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
}
-
-FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"
diff --git a/recipes-qt/meta/meta-toolchain-qt5.bb
b/recipes-qt/meta/meta-toolchain-qt5.bb
index 8991176..11b7962 100644
--- a/recipes-qt/meta/meta-toolchain-qt5.bb
+++ b/recipes-qt/meta/meta-toolchain-qt5.bb
@@ -5,3 +5,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit populate_sdk populate_sdk_qt5
+
+TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
+TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target"
+FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 02/11] qt5: improve Qt module package handling
Make it simpler to add Qt modules to image and toolchain, without need
to specify each subpackage separately. All Qt modules should provide
the ${PN} package, so create it even if empty. Make the ${PN} package
also recommend all subpackages that are normally required at run time,
namely plugins. Do the same for ${PN}-dev and ${PN}-dbg packages.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc | 21 +++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 2fc5367..8caaad3 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -47,6 +47,24 @@ INSANE_SKIP_${PN}-examples-dev += "libdir"
PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg
${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev
${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
+ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY_${PN}-dbg = "1"
+
+RRECOMMENDS_${PN} = " \
+${PN}-plugins \
+${PN}-qmlplugins \
+"
+
+RRECOMMENDS_${PN}-dev = " \
+${PN} \
+${PN}-mkspecs \
+"
+
+RRECOMMENDS_${PN}-dbg = " \
+${PN}-plugins-dbg \
+${PN}-qmlplugins-dbg \
+"
+
# extra -dbg packages
FILES_${PN}-qmlplugins-dbg = " \
${OE_QMAKE_PATH_QML}/*/.debug \
@@ -135,8 +153,7 @@ FILES_${PN}-staticdev += " \
${OE_QMAKE_PATH_LIBS}/*.a \
"
FILES_${PN}-examples = " \
-${OE_QMAKE_PATH_EXAMPLES}/README \
-${OE_QMAKE_PATH_EXAMPLES}/*/* \
+${OE_QMAKE_PATH_EXAMPLES}/* \
"
FILES_${PN}-examples-dev = " \
${OE_QMAKE_PATH_EXAMPLES}/*${SOLIBSDEV} \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 04/11] qt5: add host paths to qt.conf
Add missing HostData and HostLibraries paths to qt.conf for qmake.
Using the target sysroot for the HostData, allows us to remove the
symbolic link for the mkspecs.
Signed-off-by: Samuli Piippo
---
classes/populate_sdk_qt5.bbclass | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass
index d29ec36..3f33b23 100644
--- a/classes/populate_sdk_qt5.bbclass
+++ b/classes/populate_sdk_qt5.bbclass
@@ -4,10 +4,6 @@
inherit qmake5_paths
create_sdk_files_prepend () {
-# make a symbolic link to mkspecs for compatibility with QTCreator
-(cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \
- ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;)
-
# Generate a qt.conf file to be deployed with the SDK
qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
touch $qtconf
@@ -28,5 +24,7 @@ create_sdk_files_prepend () {
echo 'Examples = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_EXAMPLES}' >>
$qtconf
echo 'Tests = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf
echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
+echo 'HostData = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_ARCHDATA}' >>
$qtconf
echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
+echo 'HostLibraries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_LIBS}' >> $qtconf
}
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 03/11] qt5: improve support for native and nativesdk modules
Change qmake.bbclass to support building native and nativesdk packages,
so that qmake or qt5-module can be inherited and BBCLASSEXTEND used to
create native and nativesdk packages.
qtxmlpatterns and qtdeclarative native and nativesdk modules are required
for Qt Quick Compiler.
Signed-off-by: Samuli Piippo
---
classes/qmake5.bbclass | 8
classes/qmake5_base.bbclass | 11 +++
recipes-qt/qt5/qt5.inc | 2 +-
recipes-qt/qt5/qtdeclarative_git.bb | 2 ++
recipes-qt/qt5/qtxmlpatterns_git.bb | 2 ++
5 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass
index b056ea7..2b43f2e 100644
--- a/classes/qmake5.bbclass
+++ b/classes/qmake5.bbclass
@@ -13,3 +13,11 @@ do_configure() {
do_install() {
qmake5_base_do_install
}
+
+do_install_class-native() {
+qmake5_base_native_do_install
+}
+
+do_install_class-nativesdk() {
+qmake5_base_nativesdk_do_install
+}
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 44575c4..ffb3103 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -166,6 +166,17 @@ qmake5_base_do_configure () {
${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT}
${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST
|| die "Error calling $CMD"
}
+qmake5_base_native_do_install() {
+oe_runmake install INSTALL_ROOT=${D}
+}
+
+qmake5_base_nativesdk_do_install() {
+# Fix install paths for all
+find -name "Makefile*" | xargs sed -i
"s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g"
+
+oe_runmake install INSTALL_ROOT=${D}
+}
+
qmake5_base_do_install() {
# Fix install paths for all
find -name "Makefile*" | xargs sed -i
"s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 8caaad3..36d77db 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -50,7 +50,7 @@ PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg
${PN}-plugins-dbg ${PN}-qmlplu
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${PN}-dbg = "1"
-RRECOMMENDS_${PN} = " \
+RRECOMMENDS_${PN}_class-target = " \
${PN}-plugins \
${PN}-qmlplugins \
"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb
b/recipes-qt/qt5/qtdeclarative_git.bb
index 9333016..d186705 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -28,3 +28,5 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns',
'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
SRCREV = "2fdb6eba0a58b629db32f9eefec2f26df08d3d2e"
+
+BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb
b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 1be6853..da2255a 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -13,3 +13,5 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "c21924d67a8ef39282afdf3ae6fef798dfca7135"
+
+BBCLASSEXTEND =+ "native nativesdk"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 00/11] upstreaming Qt for Device Creation changes
As part of Qt for Device Creation [1], we are starting to use meta-qt5 layer when creating images for our supported devices. We have done number of changes to the layer when intergrating it with our internal layer. We would now like to upstream those changes. [1] https://www.qt.io/qt-for-device-creation The following changes since commit d2c05c81e8230358dca80cf9df67e49f9f672a29: libconnman-qt5: update to 1.0.91 (2015-07-31 16:23:35 +0200) are available in the git repository at: git://github.com/sapiippo/meta-qt5 master https://github.com/sapiippo/meta-qt5/tree/master Samuli Piippo (11): qt5: make populate_sdk_qt5 reusable qt5: improve Qt module package handling qt5: improve support for native and nativesdk modules qt5: add host paths to qt.conf qt5: disable debian auto renaming qt5: make qt5.inc reusable qt5-module.bbclass qttools: use one recipe for all compilations qtbase: remove dependency to sqlite qtbase: PACKAGECONFIGs for libproxy and libinput qtlocation: use correct dependencies qtwebengine: fix problem with recursive qmake call classes/populate_sdk_qt5.bbclass | 11 +--- classes/qmake5.bbclass | 8 +++ classes/qmake5_base.bbclass| 11 .../qt5/qt5.inc => classes/qt5-module.bbclass | 38 +++- recipes-qt/examples/cinematicexperience_1.0.bb | 2 +- recipes-qt/examples/qt5everywheredemo_1.0.bb | 2 +- recipes-qt/examples/qt5nmapcarousedemo_1.0.bb | 2 +- recipes-qt/examples/qt5nmapper_1.0.bb | 2 +- recipes-qt/examples/qtsmarthome_1.0.bb | 2 +- recipes-qt/examples/quitbattery_1.0.0.bb | 2 +- recipes-qt/examples/quitindicators_1.0.1.bb| 2 +- recipes-qt/libconnman-qt/libconnman-qt5_git.bb | 2 +- recipes-qt/meta/meta-toolchain-qt5.bb | 4 ++ recipes-qt/qt5/nativesdk-qttools_git.bb| 45 -- recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 6 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb| 4 +- recipes-qt/qt5/qtenginio_git.bb| 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 5 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb| 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb| 2 +- recipes-qt/qt5/qtsystems_git.bb| 2 +- recipes-qt/qt5/qttools-native_git.bb | 26 recipes-qt/qt5/qttools_git.bb | 11 +++- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb| 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- .../0005-Generate-usable-qmake_extras.gypi.patch | 71 ++ recipes-qt/qt5/qtwebengine_git.bb | 3 +- recipes-qt/qt5/qtwebkit-examples_git.bb| 2 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb| 4 +- 42 files changed, 183 insertions(+), 120 deletions(-) rename recipes-qt/qt5/qt5.inc => classes/qt5-module.bbclass (86%) delete mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb delete mode 100644 recipes-qt/qt5/qttools-native_git.bb create mode 100644 recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 10/11] qtlocation: use correct dependencies
Update dependencies for QtLocation module based on the sync.profile Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtlocation_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index 0264b93..c7773f2 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -10,8 +10,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv2;md5=e782f55badfa137e5e59c330f12cc8ed \ " -DEPENDS += "qtbase qt3d" -# qtsystems qtmultimedia +DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" PACKAGECONFIG ??= "" # older geoclue 0.x is needed -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 07/11] qttools: use one recipe for all compilations
Instead of separate recipes for target, native and nativesdk, use
one recipe with BBCLASSEXTEND in place.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/nativesdk-qttools_git.bb | 45 -
recipes-qt/qt5/qttools-native_git.bb| 26 ---
recipes-qt/qt5/qttools_git.bb | 9 ++-
3 files changed, 8 insertions(+), 72 deletions(-)
delete mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb
delete mode 100644 recipes-qt/qt5/qttools-native_git.bb
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb
b/recipes-qt/qt5/nativesdk-qttools_git.bb
deleted file mode 100644
index 73e5d22..000
--- a/recipes-qt/qt5/nativesdk-qttools_git.bb
+++ /dev/null
@@ -1,45 +0,0 @@
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 |
LGPL-3.0)"
-LIC_FILES_CHKSUM = " \
-file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \
-file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
-file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
-file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-QT_MODULE = "qttools"
-
-DEPENDS = "nativesdk-qtbase qtbase-native"
-
-require nativesdk-qt5.inc
-require qt5-git.inc
-
-# it's already included with newer oe-core, but include it here for dylan
-FILESEXTRAPATHS =. "${FILE_DIRNAME}/qttools:"
-
-SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
-
-PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
-
-FILES_${PN}-dbg = " \
-${OE_QMAKE_PATH_BINS}/.debug \
-"
-
-FILES_${PN} = " \
-${OE_QMAKE_PATH_BINS}/* \
-"
-
-do_configure() {
-${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly
-}
-
-do_install() {
-# Fix install paths for all
-find -name "Makefile*" | xargs sed -i
"s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g"
-
-oe_runmake install INSTALL_ROOT=${D}
-
-# remove things unused in nativesdk
-rm -rf ${D}${libdir}
-}
-
-SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"
diff --git a/recipes-qt/qt5/qttools-native_git.bb
b/recipes-qt/qt5/qttools-native_git.bb
deleted file mode 100644
index 13e1b79..000
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ /dev/null
@@ -1,26 +0,0 @@
-DEPENDS = "qtbase-native"
-
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 |
LGPL-3.0)"
-LIC_FILES_CHKSUM = " \
-file://LICENSE.LGPLv21;md5=d87ae0d200af76dca730d911474cbe5b \
-file://LICENSE.LGPLv3;md5=ffcfac38a32c9ebdb8ff768fa1702478 \
-file://LGPL_EXCEPTION.txt;md5=0145c4d1b6f96a661c2c139dfb268fb6 \
-file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-QT_MODULE = "qttools"
-
-require qt5-native.inc
-require qt5-git.inc
-
-SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
-
-do_configure() {
-${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly
-}
-
-do_install() {
-oe_runmake install INSTALL_ROOT=${D}
-}
-
-SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index e27d6ef..51690ac 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
-DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
+DEPENDS += "qtbase"
+DEPENDS_class-target = "qtdeclarative qtxmlpatterns"
SRC_URI += " \
+file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch \
file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
file://0003-add-noqtwebkit-configuration.patch \
"
@@ -24,4 +26,9 @@ PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '',
'CONFIG+=noqtwebkit', d)}"
+EXTRA_QMAKEVARS_PRE_class-native += "CONFIG+=linguistonly"
+EXTRA_QMAKEVARS_PRE_class-nativesdk += "CONFIG+=linguistonly"
+
SRCREV = "a6ed9b418d1b4464f088b378e5bdb96ec420db6c"
+
+BBCLASSEXTEND = "native nativesdk"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 05/11] qt5: disable debian auto renaming
Some of the Qt modules have multiple libs, which prevents debian auto
renaming to work correctly. Instead of only having some modules renamed,
disable renaming for all Qt module packages, so that all they all are
named as ${PN}.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc | 17 +
1 file changed, 17 insertions(+)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 36d77db..b19d271 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -47,6 +47,23 @@ INSANE_SKIP_${PN}-examples-dev += "libdir"
PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg
${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev
${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
+DEBIAN_NOAUTONAME_${PN} = "1"
+DEBIAN_NOAUTONAME_${PN}-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-dev = "1"
+DEBIAN_NOAUTONAME_${PN}-staticdev = "1"
+DEBIAN_NOAUTONAME_${PN}${LICENSE_PACKAGE_SUFFIX} = "1"
+DEBIAN_NOAUTONAME_${PN}-qmlplugins-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-tools-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-plugins-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-qmlplugins = "1"
+DEBIAN_NOAUTONAME_${PN}-tools = "1"
+DEBIAN_NOAUTONAME_${PN}-plugins = "1"
+DEBIAN_NOAUTONAME_${PN}-mkspecs = "1"
+DEBIAN_NOAUTONAME_${PN}-examples-dev = "1"
+DEBIAN_NOAUTONAME_${PN}-examples-staticdev = "1"
+DEBIAN_NOAUTONAME_${PN}-examples-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-examples = "1"
+
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${PN}-dbg = "1"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH 06/11] qt5: make qt5.inc reusable qt5-module.bbclass
On 24.08.2015 15:45, Martin Jansa wrote:
On Mon, Aug 24, 2015 at 12:13:52PM +0300, Samuli Piippo wrote:
qt5.inc has common parts that can be used to build any Qt5 module.
Make it a bbclass so that it is easily usable from other meta layers.
require recipes-qt/qt5/qt5.inc
can be used in other layers as well
It can, but as a bblclass it would make it clear that it's a supported
thing to do, like qmake5 currently is.
And maybe help guide further changes so that it remains usable from
other layers as well.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc => classes/qt5-module.bbclass | 0
recipes-qt/examples/cinematicexperience_1.0.bb | 2 +-
recipes-qt/examples/qt5everywheredemo_1.0.bb | 2 +-
recipes-qt/examples/qt5nmapcarousedemo_1.0.bb| 2 +-
recipes-qt/examples/qt5nmapper_1.0.bb| 2 +-
recipes-qt/examples/qtsmarthome_1.0.bb | 2 +-
recipes-qt/examples/quitbattery_1.0.0.bb | 2 +-
recipes-qt/examples/quitindicators_1.0.1.bb | 2 +-
recipes-qt/libconnman-qt/libconnman-qt5_git.bb | 2 +-
recipes-qt/qt5/qt3d_git.bb | 2 +-
recipes-qt/qt5/qtbase_git.bb | 2 +-
recipes-qt/qt5/qtconnectivity_git.bb | 2 +-
recipes-qt/qt5/qtdeclarative_git.bb | 2 +-
recipes-qt/qt5/qtenginio_git.bb | 2 +-
recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +-
recipes-qt/qt5/qtimageformats_git.bb | 2 +-
recipes-qt/qt5/qtlocation_git.bb | 2 +-
recipes-qt/qt5/qtmultimedia_git.bb | 2 +-
recipes-qt/qt5/qtquick1_git.bb | 2 +-
recipes-qt/qt5/qtquickcontrols_git.bb| 2 +-
recipes-qt/qt5/qtscript_git.bb | 2 +-
recipes-qt/qt5/qtsensors_git.bb | 2 +-
recipes-qt/qt5/qtserialport_git.bb | 2 +-
recipes-qt/qt5/qtsvg_git.bb | 2 +-
recipes-qt/qt5/qtsystems_git.bb | 2 +-
recipes-qt/qt5/qttools_git.bb| 2 +-
recipes-qt/qt5/qttranslations_git.bb | 2 +-
recipes-qt/qt5/qtwayland_git.bb | 2 +-
recipes-qt/qt5/qtwebchannel_git.bb | 2 +-
recipes-qt/qt5/qtwebengine_git.bb| 2 +-
recipes-qt/qt5/qtwebkit-examples_git.bb | 2 +-
recipes-qt/qt5/qtwebkit_git.bb | 2 +-
recipes-qt/qt5/qtwebsockets_git.bb | 2 +-
recipes-qt/qt5/qtx11extras_git.bb| 2 +-
recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +-
35 files changed, 34 insertions(+), 34 deletions(-)
rename recipes-qt/qt5/qt5.inc => classes/qt5-module.bbclass (100%)
diff --git a/recipes-qt/qt5/qt5.inc b/classes/qt5-module.bbclass
similarity index 100%
rename from recipes-qt/qt5/qt5.inc
rename to classes/qt5-module.bbclass
diff --git a/recipes-qt/examples/cinematicexperience_1.0.bb
b/recipes-qt/examples/cinematicexperience_1.0.bb
index 116127f..b1eee73 100644
--- a/recipes-qt/examples/cinematicexperience_1.0.bb
+++ b/recipes-qt/examples/cinematicexperience_1.0.bb
@@ -21,7 +21,7 @@ S = "${WORKDIR}/Qt5_CinematicExperience_rpi_${PV}/"
DEPENDS = "qtdeclarative qtgraphicaleffects"
RDEPENDS_${PN} = "qtdeclarative-qmlplugins qtgraphicaleffects-qmlplugins"
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
do_install() {
install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb
b/recipes-qt/examples/qt5everywheredemo_1.0.bb
index 0546b00..b906741 100644
--- a/recipes-qt/examples/qt5everywheredemo_1.0.bb
+++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb
@@ -11,7 +11,7 @@ SRC_URI = "${QT_GIT}/qt-labs/qt5-everywhere-demo.git"
S = "${WORKDIR}/git/QtDemo"
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
do_install() {
install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
b/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
index 7edf727..67525ca 100644
--- a/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
+++ b/recipes-qt/examples/qt5nmapcarousedemo_1.0.bb
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] =
"445da212074a10a432f4508d125814212bbe7a967bfa47b015b92dfac6
S = "${WORKDIR}/Qt5_NMap_CarouselDemo_1.0"
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
do_install() {
install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/qt5nmapper_1.0.bb
b/recipes-qt/examples/qt5nmapper_1.0.bb
index 77cb067..cc61b18 100644
--- a/recipes-qt/examples/qt5nmapper_1.0.bb
+++ b/recipes-qt/examples/qt5nmapper_1.0.bb
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] =
"607fbf4c448f00d3c563f9ef8a582bcb6e8fe550e80b56bf8d9127a417
S = "${WORKDIR}/Qt5_NMapper_1.0"
-require recipes-qt/qt5/qt5.inc
+inherit qt5-mod
[oe] [meta-qt5][PATCH v2 00/11] upstreaming Qt for Device Creation changes
As part of Qt for Device Creation [1], we are starting to use meta-qt5 layer when creating images for our supported devices. We have done number of changes to the layer when intergrating it with our internal layer. We would now like to upstream those changes. v2: rebased, modified qttools patch [1] https://www.qt.io/qt-for-device-creation The following changes since commit 40b7a93a3c6cf05136c606824c1cea848b75bcb6: qtquick1: allow to disable qtwebkit support (2015-08-24 15:35:52 +0200) are available in the git repository at: git://github.com/sapiippo/meta-qt5 master https://github.com/sapiippo/meta-qt5/tree/master Samuli Piippo (11): qt5: make populate_sdk_qt5 reusable qt5: improve Qt module package handling qt5: improve support for native and nativesdk modules qt5: add host paths to qt.conf qt5: disable debian auto renaming qt5: make qt5.inc reusable qt5-module.bbclass qttools: use one recipe for all compilations qtbase: remove dependency to sqlite qtbase: PACKAGECONFIGs for libproxy and libinput qtlocation: use correct dependencies qtwebengine: fix problem with recursive qmake call classes/populate_sdk_qt5.bbclass | 11 +--- classes/qmake5.bbclass | 8 +++ classes/qmake5_base.bbclass| 11 .../qt5/qt5.inc => classes/qt5-module.bbclass | 38 +++- recipes-qt/examples/cinematicexperience_1.0.bb | 2 +- recipes-qt/examples/qt5everywheredemo_1.0.bb | 2 +- recipes-qt/examples/qt5nmapcarousedemo_1.0.bb | 2 +- recipes-qt/examples/qt5nmapper_1.0.bb | 2 +- recipes-qt/examples/qtsmarthome_1.0.bb | 2 +- recipes-qt/examples/quitbattery_1.0.0.bb | 2 +- recipes-qt/examples/quitindicators_1.0.1.bb| 2 +- recipes-qt/libconnman-qt/libconnman-qt5_git.bb | 2 +- recipes-qt/meta/meta-toolchain-qt5.bb | 4 ++ recipes-qt/qt5/nativesdk-qttools_git.bb| 42 - recipes-qt/qt5/qt3d_git.bb | 2 +- recipes-qt/qt5/qtbase_git.bb | 6 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdeclarative_git.bb| 4 +- recipes-qt/qt5/qtenginio_git.bb| 2 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +- recipes-qt/qt5/qtimageformats_git.bb | 2 +- recipes-qt/qt5/qtlocation_git.bb | 5 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 2 +- recipes-qt/qt5/qtquickcontrols_git.bb | 2 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb| 2 +- recipes-qt/qt5/qtserialport_git.bb | 2 +- recipes-qt/qt5/qtsvg_git.bb| 2 +- recipes-qt/qt5/qtsystems_git.bb| 2 +- recipes-qt/qt5/qttools-native_git.bb | 24 recipes-qt/qt5/qttools_git.bb | 11 +++- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtwayland_git.bb| 2 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- .../0005-Generate-usable-qmake_extras.gypi.patch | 71 ++ recipes-qt/qt5/qtwebengine_git.bb | 3 +- recipes-qt/qt5/qtwebkit-examples_git.bb| 2 +- recipes-qt/qt5/qtwebkit_git.bb | 2 +- recipes-qt/qt5/qtwebsockets_git.bb | 2 +- recipes-qt/qt5/qtx11extras_git.bb | 2 +- recipes-qt/qt5/qtxmlpatterns_git.bb| 4 +- 42 files changed, 183 insertions(+), 115 deletions(-) rename recipes-qt/qt5/qt5.inc => classes/qt5-module.bbclass (86%) delete mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb delete mode 100644 recipes-qt/qt5/qttools-native_git.bb create mode 100644 recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2 01/11] qt5: make populate_sdk_qt5 reusable
Move task definitions from populate_sdk_qt5.bbclass to the toolchain recipe,
so that populate_sdk_qt5 can be reused in different toolchain meta recipes.
Signed-off-by: Samuli Piippo
---
classes/populate_sdk_qt5.bbclass | 5 -
recipes-qt/meta/meta-toolchain-qt5.bb | 4
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass
index 79df489..d29ec36 100644
--- a/classes/populate_sdk_qt5.bbclass
+++ b/classes/populate_sdk_qt5.bbclass
@@ -1,8 +1,5 @@
# Copyright (C) 2014 O.S. Systems Software LTDA.
-TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
-TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target"
-
# This allow reuse of Qt paths
inherit qmake5_paths
@@ -33,5 +30,3 @@ create_sdk_files_prepend () {
echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
}
-
-FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"
diff --git a/recipes-qt/meta/meta-toolchain-qt5.bb
b/recipes-qt/meta/meta-toolchain-qt5.bb
index 8991176..11b7962 100644
--- a/recipes-qt/meta/meta-toolchain-qt5.bb
+++ b/recipes-qt/meta/meta-toolchain-qt5.bb
@@ -5,3 +5,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit populate_sdk populate_sdk_qt5
+
+TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
+TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target"
+FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2 05/11] qt5: disable debian auto renaming
Some of the Qt modules have multiple libs, which prevents debian auto
renaming to work correctly. Instead of only having some modules renamed,
disable renaming for all Qt module packages, so that all they all are
named as ${PN}.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc | 17 +
1 file changed, 17 insertions(+)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 4c58ad6..f190858 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -47,6 +47,23 @@ INSANE_SKIP_${PN}-examples-dev += "libdir"
PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg
${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev
${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
+DEBIAN_NOAUTONAME_${PN} = "1"
+DEBIAN_NOAUTONAME_${PN}-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-dev = "1"
+DEBIAN_NOAUTONAME_${PN}-staticdev = "1"
+DEBIAN_NOAUTONAME_${PN}${LICENSE_PACKAGE_SUFFIX} = "1"
+DEBIAN_NOAUTONAME_${PN}-qmlplugins-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-tools-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-plugins-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-qmlplugins = "1"
+DEBIAN_NOAUTONAME_${PN}-tools = "1"
+DEBIAN_NOAUTONAME_${PN}-plugins = "1"
+DEBIAN_NOAUTONAME_${PN}-mkspecs = "1"
+DEBIAN_NOAUTONAME_${PN}-examples-dev = "1"
+DEBIAN_NOAUTONAME_${PN}-examples-staticdev = "1"
+DEBIAN_NOAUTONAME_${PN}-examples-dbg = "1"
+DEBIAN_NOAUTONAME_${PN}-examples = "1"
+
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${PN}-dbg = "1"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2 02/11] qt5: improve Qt module package handling
Make it simpler to add Qt modules to image and toolchain, without need
to specify each subpackage separately. All Qt modules should provide
the ${PN} package, so create it even if empty. Make the ${PN} package
also recommend all subpackages that are normally required at run time,
namely plugins. Do the same for ${PN}-dev and ${PN}-dbg packages.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc | 21 +++--
1 file changed, 19 insertions(+), 2 deletions(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index d0309ae..ef849bf 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -47,6 +47,24 @@ INSANE_SKIP_${PN}-examples-dev += "libdir"
PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg
${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev
${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
+ALLOW_EMPTY_${PN} = "1"
+ALLOW_EMPTY_${PN}-dbg = "1"
+
+RRECOMMENDS_${PN} = " \
+${PN}-plugins \
+${PN}-qmlplugins \
+"
+
+RRECOMMENDS_${PN}-dev = " \
+${PN} \
+${PN}-mkspecs \
+"
+
+RRECOMMENDS_${PN}-dbg = " \
+${PN}-plugins-dbg \
+${PN}-qmlplugins-dbg \
+"
+
# extra -dbg packages
FILES_${PN}-qmlplugins-dbg = " \
${OE_QMAKE_PATH_QML}/*/.debug \
@@ -138,8 +156,7 @@ FILES_${PN}-staticdev += " \
${OE_QMAKE_PATH_LIBS}/*.a \
"
FILES_${PN}-examples = " \
-${OE_QMAKE_PATH_EXAMPLES}/README \
-${OE_QMAKE_PATH_EXAMPLES}/*/* \
+${OE_QMAKE_PATH_EXAMPLES}/* \
"
FILES_${PN}-examples-dev = " \
${OE_QMAKE_PATH_EXAMPLES}/*${SOLIBSDEV} \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2 03/11] qt5: improve support for native and nativesdk modules
Change qmake.bbclass to support building native and nativesdk packages,
so that qmake or qt5-module can be inherited and BBCLASSEXTEND used to
create native and nativesdk packages.
qtxmlpatterns and qtdeclarative native and nativesdk modules are required
for Qt Quick Compiler.
Signed-off-by: Samuli Piippo
---
classes/qmake5.bbclass | 8
classes/qmake5_base.bbclass | 11 +++
recipes-qt/qt5/qt5.inc | 2 +-
recipes-qt/qt5/qtdeclarative_git.bb | 2 ++
recipes-qt/qt5/qtxmlpatterns_git.bb | 2 ++
5 files changed, 24 insertions(+), 1 deletion(-)
diff --git a/classes/qmake5.bbclass b/classes/qmake5.bbclass
index b056ea7..2b43f2e 100644
--- a/classes/qmake5.bbclass
+++ b/classes/qmake5.bbclass
@@ -13,3 +13,11 @@ do_configure() {
do_install() {
qmake5_base_do_install
}
+
+do_install_class-native() {
+qmake5_base_native_do_install
+}
+
+do_install_class-nativesdk() {
+qmake5_base_nativesdk_do_install
+}
diff --git a/classes/qmake5_base.bbclass b/classes/qmake5_base.bbclass
index 44575c4..ffb3103 100644
--- a/classes/qmake5_base.bbclass
+++ b/classes/qmake5_base.bbclass
@@ -166,6 +166,17 @@ qmake5_base_do_configure () {
${OE_QMAKE_QMAKE} -makefile -o Makefile ${OE_QMAKE_DEBUG_OUTPUT}
${OE_QMAKE_RECURSIVE} $QMAKE_VARSUBST_PRE $AFTER $PROFILES $QMAKE_VARSUBST_POST
|| die "Error calling $CMD"
}
+qmake5_base_native_do_install() {
+oe_runmake install INSTALL_ROOT=${D}
+}
+
+qmake5_base_nativesdk_do_install() {
+# Fix install paths for all
+find -name "Makefile*" | xargs sed -i
"s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g"
+
+oe_runmake install INSTALL_ROOT=${D}
+}
+
qmake5_base_do_install() {
# Fix install paths for all
find -name "Makefile*" | xargs sed -i
"s,(INSTALL_ROOT)${STAGING_DIR_TARGET},(INSTALL_ROOT),g"
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index ef849bf..4c58ad6 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -50,7 +50,7 @@ PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg
${PN}-plugins-dbg ${PN}-qmlplu
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${PN}-dbg = "1"
-RRECOMMENDS_${PN} = " \
+RRECOMMENDS_${PN}_class-target = " \
${PN}-plugins \
${PN}-qmlplugins \
"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb
b/recipes-qt/qt5/qtdeclarative_git.bb
index 421c482..f9689e6 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -33,3 +33,5 @@ do_configure_prepend() {
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtxmlpatterns',
'CONFIG+=OE_QTXMLPATTERNS_ENABLED', '', d)}"
SRCREV = "cc0df64bb0e1dea2fe37950816095802f527a241"
+
+BBCLASSEXTEND =+ "native nativesdk"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb
b/recipes-qt/qt5/qtxmlpatterns_git.bb
index cb6bf9d..3c273db 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -13,3 +13,5 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtbase"
SRCREV = "ae6504efc85adf754d60a02f81413e5949282d78"
+
+BBCLASSEXTEND =+ "native nativesdk"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2 09/11] qtbase: PACKAGECONFIGs for libproxy and libinput
Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase_git.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index be37c92..982be8e 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -129,6 +129,8 @@ PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" PACKAGECONFIG[nis] = "-nis,-no-nis" PACKAGECONFIG[widgets] = "-widgets,-no-widgets" +PACKAGECONFIG[libproxy] = "-libproxy,-no-libproxy,libproxy" +PACKAGECONFIG[libinput] = "-libinput,-no-libinput,libinput" QT_CONFIG_FLAGS += " \ -shared \ -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2 10/11] qtlocation: use correct dependencies
Update dependencies for QtLocation module based on the sync.profile Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtlocation_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb index c0ea2bb..9670506 100644 --- a/recipes-qt/qt5/qtlocation_git.bb +++ b/recipes-qt/qt5/qtlocation_git.bb @@ -10,8 +10,7 @@ LIC_FILES_CHKSUM = " \ file://LICENSE.GPLv2;md5=05832301944453ec79e40ba3c3cfceec \ " -DEPENDS += "qtbase qt3d" -# qtsystems qtmultimedia +DEPENDS += "qtbase qtxmlpatterns qtdeclarative qtquickcontrols" PACKAGECONFIG ??= "" # older geoclue 0.x is needed -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2 04/11] qt5: add host paths to qt.conf
Add missing HostData and HostLibraries paths to qt.conf for qmake.
Using the target sysroot for the HostData, allows us to remove the
symbolic link for the mkspecs.
Signed-off-by: Samuli Piippo
---
classes/populate_sdk_qt5.bbclass | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass
index d29ec36..3f33b23 100644
--- a/classes/populate_sdk_qt5.bbclass
+++ b/classes/populate_sdk_qt5.bbclass
@@ -4,10 +4,6 @@
inherit qmake5_paths
create_sdk_files_prepend () {
-# make a symbolic link to mkspecs for compatibility with QTCreator
-(cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \
- ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;)
-
# Generate a qt.conf file to be deployed with the SDK
qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
touch $qtconf
@@ -28,5 +24,7 @@ create_sdk_files_prepend () {
echo 'Examples = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_EXAMPLES}' >>
$qtconf
echo 'Tests = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf
echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
+echo 'HostData = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_ARCHDATA}' >>
$qtconf
echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
+echo 'HostLibraries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_LIBS}' >> $qtconf
}
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2 08/11] qtbase: remove dependency to sqlite
Qt defaults to bundled version of sqlite, so there is no need to have dependency to sqlite3. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index cf77a44..be37c92 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -97,7 +97,7 @@ PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci" PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds" PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite" -PACKAGECONFIG[sql-sqlite] = "-sql-sqlite,-no-sql-sqlite,sqlite3" +PACKAGECONFIG[sql-sqlite] = "-sql-sqlite,-no-sql-sqlite," PACKAGECONFIG[xcursor] = "-xcursor,-no-xcursor,libxcursor" PACKAGECONFIG[xinerama] = "-xinerama,-no-xinerama,libxinerama" PACKAGECONFIG[xinput] = "-xinput,-no-xinput" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2 11/11] qtwebengine: fix problem with recursive qmake call
On RaspberryPi, the EGL include paths were not included in the generated
ninja build files, because the pro files were run in wrong order. Fix the
order, but remove compiler overrides, as they would break the build again.
Signed-off-by: Samuli Piippo
---
.../0005-Generate-usable-qmake_extras.gypi.patch | 71 ++
recipes-qt/qt5/qtwebengine_git.bb | 1 +
2 files changed, 72 insertions(+)
create mode 100644
recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch
diff --git
a/recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch
b/recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch
new file mode 100644
index 000..89f56e0
--- /dev/null
+++ b/recipes-qt/qt5/qtwebengine/0005-Generate-usable-qmake_extras.gypi.patch
@@ -0,0 +1,71 @@
+From 9d2fafdd9a15adf51d8383bdd545d73e76ad0428 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo
+Date: Mon, 11 May 2015 13:47:06 +0300
+Subject: [PATCH] Generate usable qmake_extras.gypi
+
+Running qmake recursively does not take .depends into account, so
+the SUBDIRS need to be in correct order so that qmake_extras.gypi
+is used for the ninja files. Do no try to write compiler tools as
+it will break the build.
+
+Task-number: QTBUG-45706
+Upstream-Status: Pending
+---
+ src/core/core.pro | 7 ---
+ src/core/gyp_configure_host.pro | 3 ---
+ src/core/gyp_configure_target.pro | 3 ---
+ 3 files changed, 4 insertions(+), 9 deletions(-)
+
+diff --git a/src/core/core.pro b/src/core/core.pro
+index cf00f39..747b711 100644
+--- a/src/core/core.pro
b/src/core/core.pro
+@@ -12,9 +12,7 @@ gyp_run.depends = core_gyp_generator
+ core_module.file = core_module.pro
+ core_module.depends = gyp_run
+
+-SUBDIRS += core_gyp_generator \
+- gyp_run \
+- core_module
++SUBDIRS += core_gyp_generator
+
+ !win32 {
+ # gyp_configure_host.pro and gyp_configure_target.pro are phony pro files
that
+@@ -28,3 +26,6 @@ SUBDIRS += core_gyp_generator \
+ gyp_run.depends += gyp_configure_host gyp_configure_target
+ SUBDIRS += gyp_configure_host gyp_configure_target
+ }
++
++SUBDIRS += gyp_run \
++ core_module
+diff --git a/src/core/gyp_configure_host.pro b/src/core/gyp_configure_host.pro
+index 3eb6738..d6820c4 100644
+--- a/src/core/gyp_configure_host.pro
b/src/core/gyp_configure_host.pro
+@@ -6,9 +6,6 @@ option(host_build)
+
+ GYPI_CONTENTS = "{" \
+ " 'make_global_settings': [" \
+-"['CC.host', '$$which($$QMAKE_CC)']," \
+-"['CXX.host', '$$which($$QMAKE_CXX)']," \
+-"['LD.host', '$$which($$QMAKE_LINK)'],"
+
+ GYPI_FILE = $$absolute_path('qmake_extras.gypi')
+ !build_pass {
+diff --git a/src/core/gyp_configure_target.pro
b/src/core/gyp_configure_target.pro
+index 4d52044..f02bfa0 100644
+--- a/src/core/gyp_configure_target.pro
b/src/core/gyp_configure_target.pro
+@@ -3,9 +3,6 @@ TEMPLATE = aux
+
+ TOOLCHAIN_INCLUDES = $${QMAKE_INCDIR_EGL} $${INCLUDEPATH} $${QMAKE_INCDIR}
+
+-GYPI_CONTENTS += "['CC', '$$which($$QMAKE_CC)']," \
+- "['CXX', '$$which($$QMAKE_CXX)']," \
+- "['LD', '$$which($$QMAKE_LINK)'],"
+ GYPI_CONTENTS += " ]," \
+ " 'target_defaults': {" \
+ "'target_conditions': [" \
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qtwebengine_git.bb
b/recipes-qt/qt5/qtwebengine_git.bb
index fa0f019..1255b3c 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -80,6 +80,7 @@ SRC_URI += " \
file://0002-functions.prf-Make-sure-we-only-use-the-file-name-to.patch \
file://0003-functions.prf-allow-build-for-linux-oe-g-platform.patch \
file://0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch \
+file://0005-Generate-usable-qmake_extras.gypi.patch \
"
SRCREV_qtwebengine = "c6573119006014ff7bc0efb2da16ea35d302a1ec"
SRCREV_chromium = "41a1a031cd69e187a9608359ffe56652dcaaa6c5"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2 07/11] qttools: use one recipe for all compilations
Instead of separate recipes for target, native and nativesdk, use
one recipe with BBCLASSEXTEND in place.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/nativesdk-qttools_git.bb | 42 -
recipes-qt/qt5/qttools-native_git.bb| 24 ---
recipes-qt/qt5/qttools_git.bb | 9 ++-
3 files changed, 8 insertions(+), 67 deletions(-)
delete mode 100644 recipes-qt/qt5/nativesdk-qttools_git.bb
delete mode 100644 recipes-qt/qt5/qttools-native_git.bb
diff --git a/recipes-qt/qt5/nativesdk-qttools_git.bb
b/recipes-qt/qt5/nativesdk-qttools_git.bb
deleted file mode 100644
index b217da1..000
--- a/recipes-qt/qt5/nativesdk-qttools_git.bb
+++ /dev/null
@@ -1,42 +0,0 @@
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 |
LGPL-3.0)"
-LIC_FILES_CHKSUM = " \
-file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
-file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-QT_MODULE = "qttools"
-
-DEPENDS = "nativesdk-qtbase qtbase-native"
-
-require nativesdk-qt5.inc
-require qt5-git.inc
-
-SRC_URI += "file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch"
-
-PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
-
-FILES_${PN}-dbg = " \
-${OE_QMAKE_PATH_BINS}/.debug \
-"
-
-FILES_${PN} = " \
-${OE_QMAKE_PATH_BINS}/* \
-"
-
-do_configure() {
-${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly
-}
-
-do_install() {
-# Fix install paths for all
-find -name "Makefile*" | xargs sed -i
"s,(INSTALL_ROOT)${STAGING_DIR_HOST},(INSTALL_ROOT),g"
-
-oe_runmake install INSTALL_ROOT=${D}
-
-# remove things unused in nativesdk
-rm -rf ${D}${libdir}
-}
-
-SRCREV = "33c65366a7c3901d2aecfde3dbc485e1eac5c10c"
diff --git a/recipes-qt/qt5/qttools-native_git.bb
b/recipes-qt/qt5/qttools-native_git.bb
deleted file mode 100644
index cb78697..000
--- a/recipes-qt/qt5/qttools-native_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DEPENDS = "qtbase-native"
-
-LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 |
LGPL-3.0)"
-LIC_FILES_CHKSUM = " \
-file://LICENSE.LGPLv21;md5=58a180e1cf84c756c29f782b3a485c29 \
-file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \
-file://LGPL_EXCEPTION.txt;md5=9625233da42f9e0ce9d63651a9d97654 \
-file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
-"
-
-QT_MODULE = "qttools"
-
-require qt5-native.inc
-require qt5-git.inc
-
-do_configure() {
-${OE_QMAKE_QMAKE} ${OE_QMAKE_DEBUG_OUTPUT} -r ${S} CONFIG+=linguistonly
-}
-
-do_install() {
-oe_runmake install INSTALL_ROOT=${D}
-}
-
-SRCREV = "33c65366a7c3901d2aecfde3dbc485e1eac5c10c"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 443d58c..68fb459 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -9,9 +9,11 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
-DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
+DEPENDS += "qtbase"
+DEPENDS_class-target = "qtdeclarative qtxmlpatterns"
SRC_URI += " \
+file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch \
file://0002-assistant-help-fix-linking-of-dependent-libraries.patch \
file://0003-add-noqtwebkit-configuration.patch \
"
@@ -20,8 +22,13 @@ FILES_${PN}-tools += "${datadir}/${QT_DIR_NAME}/phrasebooks"
FILES_${PN}-examples = "${datadir}/${QT_DIR_NAME}/examples"
PACKAGECONFIG ??= ""
+PACKAGECONFIG_class-native ??= "linguistonly"
+PACKAGECONFIG_class-nativesdk ??= "linguistonly"
PACKAGECONFIG[qtwebkit] = ",,qtwebkit"
EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'qtwebkit', '',
'CONFIG+=noqtwebkit', d)}"
+EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'linguistonly',
'CONFIG+=linguistonly', '', d)}"
SRCREV = "33c65366a7c3901d2aecfde3dbc485e1eac5c10c"
+
+BBCLASSEXTEND = "native nativesdk"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v2 04/11] qt5: add host paths to qt.conf
On 30.08.2015 15:30, Jonathan Liu wrote:
On 25/08/2015 9:43 PM, Samuli Piippo wrote:
Add missing HostData and HostLibraries paths to qt.conf for qmake.
Using the target sysroot for the HostData, allows us to remove the
symbolic link for the mkspecs.
Signed-off-by: Samuli Piippo
---
classes/populate_sdk_qt5.bbclass | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/classes/populate_sdk_qt5.bbclass
b/classes/populate_sdk_qt5.bbclass
index d29ec36..3f33b23 100644
--- a/classes/populate_sdk_qt5.bbclass
+++ b/classes/populate_sdk_qt5.bbclass
@@ -4,10 +4,6 @@
inherit qmake5_paths
create_sdk_files_prepend () {
-# make a symbolic link to mkspecs for compatibility with QTCreator
-(cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \
- ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs
mkspecs;)
-
# Generate a qt.conf file to be deployed with the SDK
qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
touch $qtconf
@@ -28,5 +24,7 @@ create_sdk_files_prepend () {
echo 'Examples =
${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf
echo 'Tests = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_TESTS}' >>
$qtconf
echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
+echo 'HostData = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_ARCHDATA}'
>> $qtconf
echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}'
>> $qtconf
+echo 'HostLibraries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_LIBS}' >>
$qtconf
}
This works but is it logically correct to use a directory that contains
binaries compiled for the target as the host data directory...?
The mkspecs are architecture independent but the plugins are target
specific.
Regards,
Jonathan
HostData doesn't seem to have other usages than finding mkspecs, at
least on Qt modules. When compiling Qt with external toolchain, HostData
and ArchData are the same, unless explicitly separated. Logically maybe
not the best, but I think it's still better than the symlink.
-samuli
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v2 01/11] qt5: make populate_sdk_qt5 reusable
On 30.08.2015 15:49, Jonathan Liu wrote:
On 25/08/2015 9:43 PM, Samuli Piippo wrote:
Move task definitions from populate_sdk_qt5.bbclass to the toolchain
recipe,
so that populate_sdk_qt5 can be reused in different toolchain meta
recipes.
Signed-off-by: Samuli Piippo
---
classes/populate_sdk_qt5.bbclass | 5 -
recipes-qt/meta/meta-toolchain-qt5.bb | 4
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/classes/populate_sdk_qt5.bbclass
b/classes/populate_sdk_qt5.bbclass
index 79df489..d29ec36 100644
--- a/classes/populate_sdk_qt5.bbclass
+++ b/classes/populate_sdk_qt5.bbclass
@@ -1,8 +1,5 @@
# Copyright (C) 2014 O.S. Systems Software LTDA.
-TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
-TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target"
-
# This allow reuse of Qt paths
inherit qmake5_paths
@@ -33,5 +30,3 @@ create_sdk_files_prepend () {
echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}'
>> $qtconf
}
-
-FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"
diff --git a/recipes-qt/meta/meta-toolchain-qt5.bb
b/recipes-qt/meta/meta-toolchain-qt5.bb
index 8991176..11b7962 100644
--- a/recipes-qt/meta/meta-toolchain-qt5.bb
+++ b/recipes-qt/meta/meta-toolchain-qt5.bb
@@ -5,3 +5,7 @@ LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
inherit populate_sdk populate_sdk_qt5
+
+TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
+TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target"
+FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"
If someone had already copied meta-toolchain-qt5 into their own layer
and modified it, this would be a breaking change for them as they need
to make the same changes in their own toolchain recipe. I wonder if it
would be better if the reusable part of populate_sdk_qt5.bbclass was
split off into populate_sdk_qt5_base.bbclass instead and inherited by
populate_sdk_qt5.bbclass.
Regards,
Jonathan
That sounds reasonable to me.
-samuli
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 1/2] qt5: make populate_sdk_qt5 reusable
Split the populate_sdk_qt5 bbclass into two parts, where the generation
of qt.conf is moved to a new base bbclass. It is reusable in toolchain
meta recipes that use different tasks than meta-toolchain-qt5.
Signed-off-by: Samuli Piippo
---
classes/populate_sdk_qt5.bbclass | 34 ++
classes/populate_sdk_qt5_base.bbclass | 31 +++
2 files changed, 33 insertions(+), 32 deletions(-)
create mode 100644 classes/populate_sdk_qt5_base.bbclass
diff --git a/classes/populate_sdk_qt5.bbclass b/classes/populate_sdk_qt5.bbclass
index 149a448..bbf137d 100644
--- a/classes/populate_sdk_qt5.bbclass
+++ b/classes/populate_sdk_qt5.bbclass
@@ -1,38 +1,8 @@
# Copyright (C) 2014 O.S. Systems Software LTDA.
+inherit populate_sdk_qt5_base
+
TOOLCHAIN_HOST_TASK += "nativesdk-packagegroup-qt5-toolchain-host"
TOOLCHAIN_TARGET_TASK += "packagegroup-qt5-toolchain-target"
-# This allow reuse of Qt paths
-inherit qmake5_paths
-
-create_sdk_files_prepend () {
-# make a symbolic link to mkspecs for compatibility with QTCreator
-(cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \
- ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;)
-
-# Generate a qt.conf file to be deployed with the SDK
-qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
-touch $qtconf
-echo '[Paths]' >> $qtconf
-echo 'Prefix = ${OE_QMAKE_PATH_PREFIX}' >> $qtconf
-echo 'Headers = ${OE_QMAKE_PATH_QT_HEADERS}' >> $qtconf
-echo 'Libraries = ${OE_QMAKE_PATH_LIBS}' >> $qtconf
-echo 'ArchData = ${OE_QMAKE_PATH_QT_ARCHDATA}' >> $qtconf
-echo 'Data = ${OE_QMAKE_PATH_QT_DATA}' >> $qtconf
-echo 'Binaries = ${OE_QMAKE_PATH_QT_BINS}' >> $qtconf
-echo 'LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}' >> $qtconf
-echo 'Plugins = ${OE_QMAKE_PATH_PLUGINS}' >> $qtconf
-echo 'Imports = ${OE_QMAKE_PATH_IMPORTS}' >> $qtconf
-echo 'Qml2Imports = ${OE_QMAKE_PATH_QML}' >> $qtconf
-echo 'Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS}' >> $qtconf
-echo 'Documentation = ${OE_QMAKE_PATH_QT_DOCS}' >> $qtconf
-echo 'Settings = ${OE_QMAKE_PATH_QT_SETTINGS}' >> $qtconf
-echo 'Examples = ${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf
-echo 'Tests = ${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf
-echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
-echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
-echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf
-}
-
FEATURE_PACKAGES_qtcreator-debug = "packagegroup-qt5-qtcreator-debug"
diff --git a/classes/populate_sdk_qt5_base.bbclass
b/classes/populate_sdk_qt5_base.bbclass
new file mode 100644
index 000..4a1eed3
--- /dev/null
+++ b/classes/populate_sdk_qt5_base.bbclass
@@ -0,0 +1,31 @@
+# This allow reuse of Qt paths
+inherit qmake5_paths
+
+create_sdk_files_prepend () {
+# make a symbolic link to mkspecs for compatibility with QTCreator
+(cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \
+ ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;)
+
+# Generate a qt.conf file to be deployed with the SDK
+qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
+touch $qtconf
+echo '[Paths]' >> $qtconf
+echo 'Prefix = ${OE_QMAKE_PATH_PREFIX}' >> $qtconf
+echo 'Headers = ${OE_QMAKE_PATH_QT_HEADERS}' >> $qtconf
+echo 'Libraries = ${OE_QMAKE_PATH_LIBS}' >> $qtconf
+echo 'ArchData = ${OE_QMAKE_PATH_QT_ARCHDATA}' >> $qtconf
+echo 'Data = ${OE_QMAKE_PATH_QT_DATA}' >> $qtconf
+echo 'Binaries = ${OE_QMAKE_PATH_QT_BINS}' >> $qtconf
+echo 'LibraryExecutables = ${OE_QMAKE_PATH_LIBEXECS}' >> $qtconf
+echo 'Plugins = ${OE_QMAKE_PATH_PLUGINS}' >> $qtconf
+echo 'Imports = ${OE_QMAKE_PATH_IMPORTS}' >> $qtconf
+echo 'Qml2Imports = ${OE_QMAKE_PATH_QML}' >> $qtconf
+echo 'Translations = ${OE_QMAKE_PATH_QT_TRANSLATIONS}' >> $qtconf
+echo 'Documentation = ${OE_QMAKE_PATH_QT_DOCS}' >> $qtconf
+echo 'Settings = ${OE_QMAKE_PATH_QT_SETTINGS}' >> $qtconf
+echo 'Examples = ${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf
+echo 'Tests = ${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf
+echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
+echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
+echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf
+}
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH 2/2] qt5: add host paths to qt.conf
Add missing HostData and HostLibraries paths to qt.conf for qmake.
Using the target sysroot for the HostData, allows us to remove the
symbolic link for the mkspecs.
Signed-off-by: Samuli Piippo
---
classes/populate_sdk_qt5_base.bbclass | 6 ++
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/classes/populate_sdk_qt5_base.bbclass
b/classes/populate_sdk_qt5_base.bbclass
index 4a1eed3..b6ce596 100644
--- a/classes/populate_sdk_qt5_base.bbclass
+++ b/classes/populate_sdk_qt5_base.bbclass
@@ -2,10 +2,6 @@
inherit qmake5_paths
create_sdk_files_prepend () {
-# make a symbolic link to mkspecs for compatibility with QTCreator
-(cd ${SDK_OUTPUT}/${SDKPATHNATIVE}; \
- ln -sf ${SDKTARGETSYSROOT}${libdir}/${QT_DIR_NAME}/mkspecs mkspecs;)
-
# Generate a qt.conf file to be deployed with the SDK
qtconf=${SDK_OUTPUT}/${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}/qt.conf
touch $qtconf
@@ -26,6 +22,8 @@ create_sdk_files_prepend () {
echo 'Examples = ${OE_QMAKE_PATH_QT_EXAMPLES}' >> $qtconf
echo 'Tests = ${OE_QMAKE_PATH_QT_TESTS}' >> $qtconf
echo 'HostPrefix = ${SDKPATHNATIVE}' >> $qtconf
+echo 'HostData = ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_QT_ARCHDATA}' >>
$qtconf
echo 'HostBinaries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS}' >> $qtconf
+echo 'HostLibraries = ${SDKPATHNATIVE}${OE_QMAKE_PATH_LIBS}' >> $qtconf
echo 'Sysroot = ${SDKTARGETSYSROOT}' >> $qtconf
}
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtcanvas3d: add recipe
Qt Canvas 3D module was added in Qt 5.5 --- recipes-qt/qt5/qtcanvas3d_git.bb | 12 1 file changed, 12 insertions(+) create mode 100644 recipes-qt/qt5/qtcanvas3d_git.bb diff --git a/recipes-qt/qt5/qtcanvas3d_git.bb b/recipes-qt/qt5/qtcanvas3d_git.bb new file mode 100644 index 000..aca896f --- /dev/null +++ b/recipes-qt/qt5/qtcanvas3d_git.bb @@ -0,0 +1,12 @@ +require qt5.inc +require qt5-git.inc + +LICENSE = "LGPL-3.0 | GPL-3.0" +LIC_FILES_CHKSUM = " \ +file://LICENSE.LGPLv3;md5=c4fe8c6de4eef597feec6e90ed62e962 \ +file://LICENSE.GPL;md5=05832301944453ec79e40ba3c3cfceec \ +" + +DEPENDS = "qtdeclarative" + +SRCREV = "f8fe29aab406ded57f13ad961ba977401d9585c9" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: package Qt Quick Designer files separately
Some modules (at least Qt Quick Controls and Qt Canvas 3d) have extra
files for Qt Quick Designer integration, which are not needed in the image.
Create new ${PN}-qmldesigner package that includes those files instead of
${PN}-qmlplugins.
---
recipes-qt/qt5/qt5.inc | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 4c58ad6..17d8fd7 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -45,7 +45,7 @@ INSANE_SKIP_${PN}-examples += "libdir"
INSANE_SKIP_${PN}-examples-dbg += "libdir"
INSANE_SKIP_${PN}-examples-dev += "libdir"
-PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg
${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev
${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
+PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg
${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs
${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${PN}-dbg = "1"
@@ -58,6 +58,7 @@ RRECOMMENDS_${PN}_class-target = " \
RRECOMMENDS_${PN}-dev = " \
${PN} \
${PN}-mkspecs \
+${PN}-qmldesigner \
"
RRECOMMENDS_${PN}-dbg = " \
@@ -85,6 +86,11 @@ FILES_${PN}-plugins-dbg = " \
"
# extra packages
+FILES_${PN}-qmldesigner += " \
+${OE_QMAKE_PATH_QML}/*/designer \
+${OE_QMAKE_PATH_QML}/*/*/designer \
+"
+
# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
FILES_${PN}-qmlplugins = " \
${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v2 05/11] qt5: disable debian auto renaming
On 02.09.2015 20:53, Otavio Salvador wrote:
On Wed, Sep 2, 2015 at 2:25 PM, Martin Jansa wrote:
On Wed, Sep 02, 2015 at 02:07:15PM -0300, Otavio Salvador wrote:
On Tue, Aug 25, 2015 at 8:43 AM, Samuli Piippo
wrote:
Some of the Qt modules have multiple libs, which prevents debian auto
renaming to work correctly. Instead of only having some modules renamed,
disable renaming for all Qt module packages, so that all they all are
named as ${PN}.
I don't think this explanation is good enough reason to disable debian
renaming and that's why I didn't take it into master-next yet.
The original idea was to let qt5 package with libraries coexist with qt4
ones, I agree that not many people are using this, but on the other hand
few people asked me to provide more granular packages for qt5, so
instead of disabling debian rename everywhere why don't we split the
packages with multiple libs or define LEAD_SONAME where one library is
significantly more important than the rest and the package should be
named after it?
I have mixed feelings about this. I do see the value of splitting it
more and I also see why people may want it in less fragmented set of
runtime packages.
Putting a second thought on this I think I agree with you. The
benefits of splitting it more are higher than having less runtime
packages.
I think we could take a look at the package split done in Debian for
inspiration and this would help to reduce many iterations to get this
right. What do you think?
I think the package split is something we should do, and has been on my
want-to-do list. This patch was an attempt to get packages in consistent
order until such time that the debian naming works correctly for all
modules. I haven't looked how Debian splits the packages, but that
sounds good place to start.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtbase: use system sqlite3
Use system sqlite3 instead of the Qt's internal copy. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 9eac6d2..5d3d3dd 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -98,7 +98,7 @@ PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci" PACKAGECONFIG[sql-tds] = "-sql-tds,-no-sql-tds" PACKAGECONFIG[sql-db2] = "-sql-db2,-no-sql-db2" PACKAGECONFIG[sql-sqlite2] = "-sql-sqlite2,-no-sql-sqlite2,sqlite" -PACKAGECONFIG[sql-sqlite] = "-sql-sqlite,-no-sql-sqlite," +PACKAGECONFIG[sql-sqlite] = "-sql-sqlite -system-sqlite,-no-sql-sqlite,sqlite3" PACKAGECONFIG[xcursor] = "-xcursor,-no-xcursor,libxcursor" PACKAGECONFIG[xinerama] = "-xinerama,-no-xinerama,libxinerama" PACKAGECONFIG[xinput] = "-xinput,-no-xinput" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v2] qt5: package Qt Quick Designer files separately
Some modules (at least Qt Quick Controls and Qt Canvas 3d) have extra
files for Qt Quick Designer integration, which are not needed in the image.
Create new ${PN}-qmldesigner package that includes those files instead of
${PN}-qmlplugins.
Modify qtwebkit recipe so that it removes the conflicting {PN}-examples*
packages, instead of redefining all packages again.
---
recipes-qt/qt5/qt5.inc | 8 +++-
recipes-qt/qt5/qtwebkit_git.bb | 4 ++--
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 4c58ad6..17d8fd7 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -45,7 +45,7 @@ INSANE_SKIP_${PN}-examples += "libdir"
INSANE_SKIP_${PN}-examples-dbg += "libdir"
INSANE_SKIP_${PN}-examples-dev += "libdir"
-PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg
${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev
${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
+PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg
${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs
${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${PN}-dbg = "1"
@@ -58,6 +58,7 @@ RRECOMMENDS_${PN}_class-target = " \
RRECOMMENDS_${PN}-dev = " \
${PN} \
${PN}-mkspecs \
+${PN}-qmldesigner \
"
RRECOMMENDS_${PN}-dbg = " \
@@ -85,6 +86,11 @@ FILES_${PN}-plugins-dbg = " \
"
# extra packages
+FILES_${PN}-qmldesigner += " \
+${OE_QMAKE_PATH_QML}/*/designer \
+${OE_QMAKE_PATH_QML}/*/*/designer \
+"
+
# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
FILES_${PN}-qmlplugins = " \
${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 74f98a7..d80ab7f 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -55,8 +55,8 @@ do_configure_prepend() {
QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}"
-# remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it
conflicts with ${PN} from separate webkit-examples recipe
-PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale
${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg
${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
+# remove default ${PN}-examples* set in qt5.inc, because they conflicts with
${PN} from separate webkit-examples recipe
+PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev
${PN}-examples-dbg ${PN}-examples"
# make sure rb files are used from sysroot, not from host
# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed
s/i.86/i386/`
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v3 2/2] qt5: package Qt Quick Designer files separately
Some modules (at least Qt Quick Controls and Qt Canvas 3d) have extra
files for Qt Quick Designer integration, which are not needed in the image.
Create new ${PN}-qmldesigner package that includes those files instead of
${PN}-qmlplugins.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 4c58ad6..17d8fd7 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -45,7 +45,7 @@ INSANE_SKIP_${PN}-examples += "libdir"
INSANE_SKIP_${PN}-examples-dbg += "libdir"
INSANE_SKIP_${PN}-examples-dev += "libdir"
-PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg
${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev
${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
+PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg
${PN}-qmldesigner ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs
${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${PN}-dbg = "1"
@@ -58,6 +58,7 @@ RRECOMMENDS_${PN}_class-target = " \
RRECOMMENDS_${PN}-dev = " \
${PN} \
${PN}-mkspecs \
+${PN}-qmldesigner \
"
RRECOMMENDS_${PN}-dbg = " \
@@ -85,6 +86,11 @@ FILES_${PN}-plugins-dbg = " \
"
# extra packages
+FILES_${PN}-qmldesigner += " \
+${OE_QMAKE_PATH_QML}/*/designer \
+${OE_QMAKE_PATH_QML}/*/*/designer \
+"
+
# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
FILES_${PN}-qmlplugins = " \
${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH v3 1/2] qtwebkit: do not redefine all PACKAGES
Modify qtwebkit recipe so that it removes the conflicting {PN}-examples*
packages, instead of redefining all packages again.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qtwebkit_git.bb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 74f98a7..d80ab7f 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -55,8 +55,8 @@ do_configure_prepend() {
QTWEBKIT_DEBUG = "QMAKE_CFLAGS+=-g0 QMAKE_CXXFLAGS+=-g0"
EXTRA_QMAKEVARS_PRE += "${QTWEBKIT_DEBUG}"
-# remove default ${PN}-examples-dbg ${PN}-examples set in qt5.inc, because it
conflicts with ${PN} from separate webkit-examples recipe
-PACKAGES = "${PN}-dbg ${PN}-staticdev ${PN}-dev ${PN}-doc ${PN}-locale
${PACKAGE_BEFORE_PN} ${PN} ${PN}-qmlplugins-dbg ${PN}-tools-dbg
${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs "
+# remove default ${PN}-examples* set in qt5.inc, because they conflicts with
${PN} from separate webkit-examples recipe
+PACKAGES_remove = "${PN}-examples-dev ${PN}-examples-staticdev
${PN}-examples-dbg ${PN}-examples"
# make sure rb files are used from sysroot, not from host
# ruby-1.9.3-always-use-i386.patch is doing target_cpu=`echo $target_cpu | sed
s/i.86/i386/`
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH 06/11] qt5: make qt5.inc reusable qt5-module.bbclass
On 25.08.2015 10:20, Samuli Piippo wrote: On 24.08.2015 15:45, Martin Jansa wrote: On Mon, Aug 24, 2015 at 12:13:52PM +0300, Samuli Piippo wrote: qt5.inc has common parts that can be used to build any Qt5 module. Make it a bbclass so that it is easily usable from other meta layers. require recipes-qt/qt5/qt5.inc can be used in other layers as well It can, but as a bblclass it would make it clear that it's a supported thing to do, like qmake5 currently is. And maybe help guide further changes so that it remains usable from other layers as well. Is this something that you can consider adding in? I'll do a rebase for it, if it is. -samuli -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH 06/11] qt5: make qt5.inc reusable qt5-module.bbclass
On 25.08.2015 10:20, Samuli Piippo wrote: On 24.08.2015 15:45, Martin Jansa wrote: On Mon, Aug 24, 2015 at 12:13:52PM +0300, Samuli Piippo wrote: qt5.inc has common parts that can be used to build any Qt5 module. Make it a bbclass so that it is easily usable from other meta layers. require recipes-qt/qt5/qt5.inc can be used in other layers as well It can, but as a bblclass it would make it clear that it's a supported thing to do, like qmake5 currently is. And maybe help guide further changes so that it remains usable from other layers as well. Is this something that you can consider adding in? I'll do a rebase for it, if it is. -samuli -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: use extra .pri file from linux-oe-g++ mkspec
Load additional oe-device-extra.pri in the default linux-oe-g++ mkspec to allow simple changing of target dependent values. This is useful for any target that needs to specify e.g., QMAKE_LIBS_EGL or other additional configs. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index e67df40..91bb9f3 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -45,9 +45,9 @@ Signed-off-by: Martin Jansa --- configure| 70 +++- mkspecs/features/configure.prf | 4 +- - mkspecs/linux-oe-g++/qmake.conf | 40 ++ + mkspecs/linux-oe-g++/qmake.conf | 42 +++ mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++ - 4 files changed, 186 insertions(+), 28 deletions(-) + 4 files changed, 188 insertions(+), 28 deletions(-) create mode 100644 mkspecs/linux-oe-g++/qmake.conf create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h @@ -197,10 +197,10 @@ index 6b37a04..dcf6025 100644 write_file($$QMAKE_CONFIG_LOG, msg, append) diff --git a/mkspecs/linux-oe-g++/qmake.conf b/mkspecs/linux-oe-g++/qmake.conf new file mode 100644 -index 000..2ad2810 +index 000..d0a4166 --- /dev/null +++ b/mkspecs/linux-oe-g++/qmake.conf -@@ -0,0 +1,40 @@ +@@ -0,0 +1,42 @@ +# +# qmake configuration for linux-g++ with modifications for building with OpenEmbedded +# @@ -240,6 +240,8 @@ index 000..2ad2810 +# for the SDK +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) + ++exists(../oe-device-extra.pri):include(../oe-device-extra.pri) ++ +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h new file mode 100644 -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtbase: include oe-device-extra.pri unconditionally
configure parses through the mkspec, but does not handle conditions at all, so oe-device-extra.pri was not included at configure phase. For example QT_QPA_DEFAULT_PLATFORM had no effect for configure. include() is conditional and won't break build even when oe-device-extra.pri does not exist. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index a9c448d..d377921 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -240,7 +240,7 @@ index 000..d0a4166 +# for the SDK +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) + -+exists(../oe-device-extra.pri):include(../oe-device-extra.pri) ++include(../oe-device-extra.pri) + +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qtbase: include oe-device-extra.pri unconditionally
And even more confusing when using qmake from external toolchain. I'll prepare a new patch for this. -samuli On 05.11.2015 21:46, Martin Jansa wrote: On Mon, Nov 02, 2015 at 04:03:41PM +0200, Samuli Piippo wrote: configure parses through the mkspec, but does not handle conditions at all, so oe-device-extra.pri was not included at configure phase. For example QT_QPA_DEFAULT_PLATFORM had no effect for configure. include() is conditional and won't break build even when oe-device-extra.pri does not exist. And now every log.do_configure shows: DEBUG: Executing shell function do_configure Cannot read /OE/build/owpb/webos-ports/tmp-glibc/sysroots/qemux86/usr/lib/qt5/mkspecs/oe-device-extra.pri: No such file or directory Which can confuse some people.. :/ Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch index a9c448d..d377921 100644 --- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch +++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch @@ -240,7 +240,7 @@ index 000..d0a4166 +# for the SDK +isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG) + -+exists(../oe-device-extra.pri):include(../oe-device-extra.pri) ++include(../oe-device-extra.pri) + +load(qt_config) diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h b/mkspecs/linux-oe-g++/qplatformdefs.h -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCHv2] qtbase: support oe-device-extra.pri in configure
configure parses through the mkspec, but does not handle conditions
at all, so oe-device-extra.pri was not included at configure phase.
For example QT_QPA_DEFAULT_PLATFORM had no effect for configure.
With include() on a separate line, oe-device-extra.pri is correctly
included also in configure.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index a9c448d..0826ba1 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -45,9 +45,9 @@ Signed-off-by: Martin Jansa
---
configure| 70 +++-
mkspecs/features/configure.prf | 4 +-
- mkspecs/linux-oe-g++/qmake.conf | 42 +++
+ mkspecs/linux-oe-g++/qmake.conf | 44 +++
mkspecs/linux-oe-g++/qplatformdefs.h | 100 +++
- 4 files changed, 188 insertions(+), 28 deletions(-)
+ 4 files changed, 190 insertions(+), 28 deletions(-)
create mode 100644 mkspecs/linux-oe-g++/qmake.conf
create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
@@ -200,7 +200,7 @@ new file mode 100644
index 000..d0a4166
--- /dev/null
+++ b/mkspecs/linux-oe-g++/qmake.conf
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,44 @@
+#
+# qmake configuration for linux-g++ with modifications for building with
OpenEmbedded
+#
@@ -240,7 +240,9 @@ index 000..d0a4166
+# for the SDK
+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
+
-+exists(../oe-device-extra.pri):include(../oe-device-extra.pri)
++exists(../oe-device-extra.pri) {
++ include(../oe-device-extra.pri)
++}
+
+load(qt_config)
diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h
b/mkspecs/linux-oe-g++/qplatformdefs.h
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtwayland: remove unnecessary header install
Installation of the generated headers was fixed in qtbase v5.3.2
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qtwayland_git.bb | 8
1 file changed, 8 deletions(-)
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 2ea3285..f96a6cd 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -38,12 +38,4 @@ SRC_URI += " \
file://0001-examples-wayland-include-server-buffer-only-when-bui.patch \
"
-QT_VERSION ?= "5.5.1"
-
-do_install_append() {
-# do install files created by qtwaylandscanner
-install
${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/qwayland-server-*.h
${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private
-install
${B}/include/QtCompositor/${QT_VERSION}/QtCompositor/private/*protocol*.h
${D}${OE_QMAKE_PATH_QT_HEADERS}/QtCompositor/${QT_VERSION}/QtCompositor/private
-}
-
SRCREV = "9d408649458a274864ae2e7c2d67b4fa3cabbfcd"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCHv2] qtbase: support oe-device-extra.pri in configure
On 17.11.2015 00:03, Martin Jansa wrote:
On Fri, Nov 06, 2015 at 03:20:09PM +0200, Samuli Piippo wrote:
configure parses through the mkspec, but does not handle conditions
at all, so oe-device-extra.pri was not included at configure phase.
For example QT_QPA_DEFAULT_PLATFORM had no effect for configure.
With include() on a separate line, oe-device-extra.pri is correctly
included also in configure.
Please resend version applicable for 5.6 in master branch (this will be
merged to jethro after more testing in master branch).
This still produces few warning lines to configure output. I wonder if
it would be better to change the patch so that it creates an empty
oe-device-extra.pri file? It would then always be available and easily
patched/overwritten when needed.
-samuli
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
index a9c448d..0826ba1 100644
--- a/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
+++ b/recipes-qt/qt5/qtbase/0001-Add-linux-oe-g-platform.patch
@@ -45,9 +45,9 @@ Signed-off-by: Martin Jansa
---
configure| 70 +++-
mkspecs/features/configure.prf | 4 +-
- mkspecs/linux-oe-g++/qmake.conf | 42 +++
+ mkspecs/linux-oe-g++/qmake.conf | 44 +++
mkspecs/linux-oe-g++/qplatformdefs.h | 100
+++
- 4 files changed, 188 insertions(+), 28 deletions(-)
+ 4 files changed, 190 insertions(+), 28 deletions(-)
create mode 100644 mkspecs/linux-oe-g++/qmake.conf
create mode 100644 mkspecs/linux-oe-g++/qplatformdefs.h
@@ -200,7 +200,7 @@ new file mode 100644
index 000..d0a4166
--- /dev/null
+++ b/mkspecs/linux-oe-g++/qmake.conf
-@@ -0,0 +1,42 @@
+@@ -0,0 +1,44 @@
+#
+# qmake configuration for linux-g++ with modifications for building with
OpenEmbedded
+#
@@ -240,7 +240,9 @@ index 000..d0a4166
+# for the SDK
+isEmpty(QMAKE_QT_CONFIG):QMAKE_QT_CONFIG = $(OE_QMAKE_QT_CONFIG)
+
-+exists(../oe-device-extra.pri):include(../oe-device-extra.pri)
++exists(../oe-device-extra.pri) {
++ include(../oe-device-extra.pri)
++}
+
+load(qt_config)
diff --git a/mkspecs/linux-oe-g++/qplatformdefs.h
b/mkspecs/linux-oe-g++/qplatformdefs.h
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtbase: add PACKAGECONFIG for xkbcommon-evdev
Add PACKAGECONFIG for xkbcommon-evdev to fix QA Issue: qtbase rdepends on libxkbcommon, but it isn't a build dependency? [build-deps] Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase_git.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index fdc73e1..e504ab7 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -107,6 +107,7 @@ PACKAGECONFIG[xvideo] = "-xvideo,-no-xvideo" PACKAGECONFIG[openvg] = "-openvg,-no-openvg" PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" +PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon" PACKAGECONFIG[evdev] = "-evdev,-no-evdev" PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" # depends on glib -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: overwrite RRECOMMENDS_${PN} for native packages
The class-target overwrite for RRECOMMENDS_${PN} prevented appending
new packages to the list in other recipes, without using the
class-target overwrite there as well. Instead set RECOMMENDS to empty
for native packages, where it is not needed.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 39f7c3c..4b748fb 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -48,10 +48,11 @@ PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg
${PN}-plugins-dbg ${PN}-qmldes
ALLOW_EMPTY_${PN} = "1"
ALLOW_EMPTY_${PN}-dbg = "1"
-RRECOMMENDS_${PN}_class-target = " \
+RRECOMMENDS_${PN} = " \
${PN}-plugins \
${PN}-qmlplugins \
"
+RRECOMMENDS_${PN}_class-native = ""
RRECOMMENDS_${PN}-dev = " \
${PN} \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: add extra path to qmlplugins
QtDeclarative installs file builtins.qmltypes under $$[QT_INSTALL_QML],
which was not included in the qmlplugins package.
Fix QA Issue: Files/directories were installed but not shipped
with qtdeclarative SRCREV 94e9fab2
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 4b748fb..ce9d976 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -92,6 +92,7 @@ FILES_${PN}-qmldesigner += " \
# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
FILES_${PN}-qmlplugins = " \
+${OE_QMAKE_PATH_QML}/*.qmltypes \
${OE_QMAKE_PATH_QML}/*/*${SOLIBSDEV} \
${OE_QMAKE_PATH_QML}/*/qmldir \
${OE_QMAKE_PATH_QML}/*/*.qmltypes \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtbase: use PACKAGECONFIG to ensure runtime dependency to libssl
Using openssl-linked configure has side effect that gdb catches the SIGILL signal, which openssl uses internally on ARM, every time when starting debugging any Qt application. This is annoying and somewhat confusing behavior even with QtCreator. Using the default openssl configure argument prevents this, while using the 4th argument for PACKAGECONFIG keeps the runtime dependency to libssl correctly in place. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase_git.bb | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index 7ee5f56..2ef8a75 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -121,8 +121,7 @@ PACKAGECONFIG[kms] = "-kms,-no-kms,virtual/mesa virtual/egl" # needed for qtwebkit PACKAGECONFIG[icu] = "-icu,-no-icu,icu" PACKAGECONFIG[udev] = "-libudev,-no-libudev,udev" -# use -openssl-linked here to ensure that RDEPENDS for libcrypto and libssl are detected -PACKAGECONFIG[openssl] = "-openssl-linked,-no-openssl,openssl" +PACKAGECONFIG[openssl] = "-openssl,-no-openssl,openssl,libssl" PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" PACKAGECONFIG[nis] = "-nis,-no-nis" -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtbase: re-enable replacing host paths in qconfig.pri
Uncomment code that replaces host paths with qmake built-in properties
in qconfig.pri. Modified to replace paths in all *.pri files in mkspecs
directory and to also change paths without space in front of it.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qtbase_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 2ef8a75..8b6f509 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -221,9 +221,9 @@ do_install_append() {
rm -rf ${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/macx-ios-clang
# Replace host paths with qmake built-in properties
-#sed -i -e 's| ${STAGING_DIR_NATIVE}${prefix_native}|
$$[QT_HOST_PREFIX]|g' \
-#-e 's| ${STAGING_DIR_HOST}| $$[QT_SYSROOT]|g' \
-#${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/qconfig.pri
+sed -i -e 's|${STAGING_DIR_NATIVE}${prefix_native}|$$[QT_HOST_PREFIX]|g' \
+-e 's|${STAGING_DIR_HOST}|$$[QT_SYSROOT]|g' \
+${D}/${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/*.pri
}
PACKAGES =. " \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: allow overriding git protocol used with QT_GIT uri
Add option QT_GIT_PROTOCOL to specify the protocol to be used
with the QT_GIT uri.
Signed-off-by: Samuli Piippo
---
conf/layer.conf| 1 +
recipes-qt/qt5/qt5-git.inc | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/conf/layer.conf b/conf/layer.conf
index f83bd96..b7207e6 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -28,3 +28,4 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
IMAGE_FEATURES[validitems] += "qtcreator-debug"
QT_GIT ?= "git://github.com/qtproject"
+QT_GIT_PROTOCOL ?= "git"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 172a170..f8fb38b 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -6,7 +6,7 @@ QT_MODULE_BRANCH ?= "5.6"
# each module needs to define valid SRCREV
SRC_URI = " \
-${QT_GIT}/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
+
${QT_GIT}/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL}
\
"
S = "${WORKDIR}/git"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qtwebengine: build examples by default
On 30.01.2016 16:13, Otavio Salvador wrote: On Wed, Jan 27, 2016 at 12:58 PM, Manuel Bachmann wrote: From: Manuel Bachmann Just as we do for qtwebkit, let us have a patch to build qtwebengine examples by default. Otherwise, the "qtwebengine-examples" package will be empty, and attempting to add it with "IMAGE_INSTALL_append" will result in an error message. Signed-off-by: Manuel Bachmann This should be a distro option and not enabled for everyone. Also there is no need to do this with a patch, same result is achieved with: EXTRA_QMAKEVARS_PRE += "QT_BUILD_PARTS+=examples" Maybe this could be added to qt5.inc as a PACKAGECONFIG option? This would allow easily enable examples on any qt module. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qtwebengine: build examples by default
On 01.02.2016 13:14, Otavio Salvador wrote: On Mon, Feb 1, 2016 at 8:44 AM, Samuli Piippo wrote: On 30.01.2016 16:13, Otavio Salvador wrote: On Wed, Jan 27, 2016 at 12:58 PM, Manuel Bachmann wrote: From: Manuel Bachmann Just as we do for qtwebkit, let us have a patch to build qtwebengine examples by default. Otherwise, the "qtwebengine-examples" package will be empty, and attempting to add it with "IMAGE_INSTALL_append" will result in an error message. Signed-off-by: Manuel Bachmann This should be a distro option and not enabled for everyone. Also there is no need to do this with a patch, same result is achieved with: EXTRA_QMAKEVARS_PRE += "QT_BUILD_PARTS+=examples" Maybe this could be added to qt5.inc as a PACKAGECONFIG option? This would allow easily enable examples on any qt module. It is: https://github.com/meta-qt5/meta-qt5/blob/master/recipes-qt/qt5/qtbase_git.bb#L67 Enabling the PACKAGECONFIG[examples] from qtbase means that every qt module will build their examples. If added to qt5.inc, it would build examples only from a qt module you bbappend with PACKAGECONFIG += examples. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: use common PACKAGECONFIG to build examples
Each Qt module's examples can now be enabled with PACKAGECONFIG.
Replace the webkit patch with a PACKAGECONFIG option and follow
common practice by not building QtWayland examples by default,
those can be enabled in a .bbappend with PACKAGECONFIG += "examples"
Enabling PACKAGECONFIG[examples] in qtbase, will still cause every
Qt module to build their examples.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc | 3 +++
recipes-qt/qt5/qtwayland_git.bb| 2 --
...amples-enable-building-examples-by-defaul.patch | 29 --
recipes-qt/qt5/qtwebkit-examples_git.bb| 4 +--
4 files changed, 4 insertions(+), 34 deletions(-)
delete mode 100644
recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index ce9d976..70e4b30 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -5,6 +5,9 @@ inherit qmake5
PACKAGECONFIG_OPENSSL ?= "openssl"
+PACKAGECONFIG[examples] = ""
+EXTRA_QMAKEVARS_PRE += "${@base_contains('PACKAGECONFIG', 'examples',
'QT_BUILD_PARTS+=examples', '', d)}"
+
# we don't want conflicts with qt4
OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
OE_QMAKE_PATH_ARCHDATA = "${OE_QMAKE_PATH_QT_ARCHDATA}"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 059c2db..128794c 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -20,11 +20,9 @@ DEPENDS += "qtbase qtdeclarative wayland wayland-native
qtwayland-native ${XKB_D
QT_WAYLAND_CONFIG ?= "wayland-compositor"
QT_WAYLAND_DEFINES ?= ""
-QT_WAYLAND_BUILD_PARTS ?= "examples"
EXTRA_QMAKEVARS_PRE += "CONFIG+=${QT_WAYLAND_CONFIG}"
EXTRA_QMAKEVARS_PRE += "DEFINES+=${QT_WAYLAND_DEFINES}"
-EXTRA_QMAKEVARS_PRE += "QT_BUILD_PARTS+=${QT_WAYLAND_BUILD_PARTS}"
FILES_${PN}-plugins += " \
${OE_QMAKE_PATH_PLUGINS}/*/*/*${SOLIBSDEV} \
diff --git
a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch
b/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch
deleted file mode 100644
index 3034f95..000
---
a/recipes-qt/qt5/qtwebkit-examples/0001-qtwebkit-examples-enable-building-examples-by-defaul.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 8900f45818b7f181d2b57ceebdf086c78d2ee6b0 Mon Sep 17 00:00:00 2001
-From: Denys Dmytriyenko
-Date: Tue, 8 Oct 2013 00:18:10 -0400
-Subject: [PATCH] qtwebkit-examples: enable building examples by default
-
-Examples are provided in sources, but the build for them is not enabled by
-default. Since example binaries are packaged separately to ${PN}-examples,
-having them built by default makes more sense.
-
-Upstream-Status: Inappropriate [configuration]
-
-Signed-off-by: Denys Dmytriyenko
- qtwebkit-examples.pro | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtwebkit-examples.pro b/qtwebkit-examples.pro
-index 3fcecf1..2da8a36 100644
a/qtwebkit-examples.pro
-+++ b/qtwebkit-examples.pro
-@@ -2,4 +2,4 @@ requires(qtHaveModule(webkit))
-
- load(qt_parts)
-
--SUBDIRS += doc
-+SUBDIRS += doc examples
---
-2.6.1
-
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb
b/recipes-qt/qt5/qtwebkit-examples_git.bb
index f915083..a0d4e9f 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -13,9 +13,7 @@ LIC_FILES_CHKSUM = " \
file://examples/webkitwidgets/imageanalyzer/imageanalyzer.cpp;endline=39;md5=b0739af76072fbe303dc04b6941e054f
\
"
-SRC_URI += " \
-file://0001-qtwebkit-examples-enable-building-examples-by-defaul.patch \
-"
+PACKAGECONFIG ?= "examples"
DEPENDS += "qtwebkit qtxmlpatterns"
RDEPENDS_${PN}-examples += "qtwebkit-qmlplugins"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: add Qml support to lupdate
Add dependency to qtdeclarative to qttools' native and nativesdk builds.
This gives us lupdate with a support for Qml files. The nativesdk builds
of qtdeclarative depend on more modules (Xml, Sql) from nativesdk-qtbase,
so preserve all libs that are already built. This brings few extra libs
to the package that might not be needed, but keeps the recipe simpler.
Signed-off-by: Samuli Piippo
---
.../nativesdk-packagegroup-qt5-toolchain-host.bb | 2 +-
recipes-qt/qt5/nativesdk-qtbase_git.bb| 19 ++-
recipes-qt/qt5/qttools_git.bb | 3 +--
3 files changed, 4 insertions(+), 20 deletions(-)
diff --git
a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
index 4cc0b93..71746f0 100644
--- a/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
+++ b/recipes-qt/packagegroups/nativesdk-packagegroup-qt5-toolchain-host.bb
@@ -9,6 +9,6 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
RDEPENDS_${PN} += " \
nativesdk-packagegroup-sdk-host \
-nativesdk-qttools \
+nativesdk-qttools-tools \
nativesdk-qtbase-tools \
"
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb
b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 3d4900e..4ac80be 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -49,6 +49,7 @@ PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
FILES_${PN}-tools-dev = " \
${includedir} \
${FILES_SOLIBSDEV} ${libdir}/*.la \
+${libdir}/*.prl \
${OE_QMAKE_PATH_ARCHDATA}/mkspecs \
"
@@ -201,16 +202,6 @@ do_configure() {
bin/qmake ${OE_QMAKE_DEBUG_OUTPUT} ${S} -o Makefile || die "Configuring qt
with qmake failed. EXTRA_OECONF was ${EXTRA_OECONF}"
}
-# Set the EXTRA_QTLIB variable to e.g. Xml, in order to not remove
libQt5Xml.so.*
-EXTRA_QTLIB ?= ""
-
-python __anonymous () {
-templibs = ""
-for e in d.getVar("EXTRA_QTLIB", True).split():
-templibs = "%s -not -name 'libQt5%s.so*' -and" % (templibs, e)
-d.setVar("QTLIBSPRESERVE", templibs)
-}
-
do_install() {
# Fix install paths for all
find -name "Makefile*" | xargs sed -i
"s,(INSTALL_ROOT)${STAGING_DIR_NATIVE}${STAGING_DIR_NATIVE},(INSTALL_ROOT)${STAGING_DIR_NATIVE},g"
@@ -223,17 +214,11 @@ do_install() {
# e.g. qt3d, qtwayland
ln -sf syncqt.pl ${D}${OE_QMAKE_PATH_QT_BINS}/syncqt
-# remove things unused in nativesdk, we need the headers, Qt5Core
-# and Qt5Bootstrap.
+# remove things unused in nativesdk, we need the headers and libs
rm -rf ${D}${datadir} \
${D}/${OE_QMAKE_PATH_PLUGINS} \
${D}${libdir}/cmake \
${D}${libdir}/pkgconfig
-find ${D}${libdir} -maxdepth 1 -name 'lib*' -and -not -type d -and \
- -not -name 'libQt5Core.so*' -and \
- ${QTLIBSPRESERVE} \
- -not -name 'libQt5Bootstrap.a' \
- -exec rm '{}' ';'
# Install CMake's toolchain configuration
mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index 5ee1e86..8c22e75 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -10,8 +10,7 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
-DEPENDS += "qtbase"
-DEPENDS_class-target = "qtdeclarative qtxmlpatterns"
+DEPENDS += "qtbase qtdeclarative qtxmlpatterns"
SRC_URI += " \
file://0001-Allow-to-build-only-lrelease-lupdate-lconvert.patch \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt3d: support qgltf in native and nativesdk builds
qgltf is used to import a variety of 3D model formats and export into
fast-to-load, optimized glTF assets embedded into Qt resource files
---
.../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 31 ++
recipes-qt/qt5/qt3d_git.bb | 16 ++-
2 files changed, 46 insertions(+), 1 deletion(-)
create mode 100644 recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
diff --git a/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
new file mode 100644
index 000..c9d2223
--- /dev/null
+++ b/recipes-qt/qt5/qt3d/0001-Allow-a-tools-only-build.patch
@@ -0,0 +1,31 @@
+From 778d0c4515bae5bdeb650fb3e6b3e32a73722b51 Mon Sep 17 00:00:00 2001
+From: Samuli Piippo
+Date: Wed, 10 Feb 2016 09:02:09 +0200
+Subject: [PATCH] Allow a tools-only build
+
+---
+ qt3d.pro | 7 ++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/qt3d.pro b/qt3d.pro
+index a26e76d..263e3c4 100644
+--- a/qt3d.pro
b/qt3d.pro
+@@ -1,4 +1,4 @@
+-requires(contains(QT_CONFIG, opengl))
++!tools-only:requires(contains(QT_CONFIG, opengl))
+
+ load(configure)
+ qtCompileTest(assimp)
+@@ -17,3 +17,8 @@ load(qt_parts)
+
+ OTHER_FILES += \
+ sync.profile
++
++tools-only {
++sub_tools.depends -= sub_src
++SUBDIRS = sub_tools
++}
+--
+1.9.1
+
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 0ec99c6..a19422b 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -8,7 +8,19 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.GPL;md5=05832301944453ec79e40ba3c3cfceec \
"
-DEPENDS = "qtdeclarative"
+DEPENDS += "qtbase"
+DEPENDS_class-target += "qtdeclarative qt3d-native"
+
+SRC_URI += " \
+file://0001-Allow-a-tools-only-build.patch \
+"
+
+PACKAGECONFIG ??= ""
+PACKAGECONFIG_class-native ??= "tools-only"
+PACKAGECONFIG_class-nativesdk ??= "tools-only"
+PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
+
+EXTRA_QMAKEVARS_PRE += "${EXTRA_OECONF}"
FILES_${PN}-qmlplugins += " \
${OE_QMAKE_PATH_QML}/*/*/*.bez \
@@ -16,3 +28,5 @@ FILES_${PN}-qmlplugins += " \
"
SRCREV = "9b9f34701f47824e8201453d148152fb0855f98a"
+
+BBCLASSEXTEND += "native nativesdk"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] nativesdk-qtbase: use runtime linked dbus
Remove direct dependency to nativesdk-dbus. Instead configure
qtbase to use runtime linked dbus library, if that is found.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/nativesdk-qtbase_git.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb
b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 4ac80be..d800b8c 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "SDK version of Qt/[X11|Mac|Embedded]"
-DEPENDS = "nativesdk-zlib nativesdk-dbus qtbase-native"
+DEPENDS = "nativesdk-zlib qtbase-native"
SECTION = "libs"
HOMEPAGE = "http://qt-project.org";
@@ -155,6 +155,7 @@ do_configure() {
-sysroot ${STAGING_DIR_NATIVE} \
-no-gcc-sysroot \
-system-zlib \
+-dbus-runtime \
-no-libjpeg \
-no-libpng \
-no-gif \
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] nativesdk-qtbase: use runtime linked dbus
On 16.02.2016 00:34, Otavio Salvador wrote: On Sun, Feb 14, 2016 at 2:25 PM, Samuli Piippo wrote: Remove direct dependency to nativesdk-dbus. Instead configure qtbase to use runtime linked dbus library, if that is found. Signed-off-by: Samuli Piippo Why? This puts a dependency on the host operating system version. Am I missing something? Currently nativesdk-qtbase does not package libQt5DBus.so, so there nothing in the SDK that actual uses dbus, but it's still built as a dependency. If "qt5: add Qml support to lupdate" patch is merged, then nativesdk-dbus would be pulled into SDK as well, although I think it's still unlikely that anyone would need it. If there is really need for it, then you can always add nativesdk-dbus to your toolchain. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] nativesdk-qtbase: use runtime linked dbus
On 16.02.2016 13:38, Otavio Salvador wrote: On Tue, Feb 16, 2016 at 7:13 AM, Samuli Piippo wrote: On 16.02.2016 00:34, Otavio Salvador wrote: On Sun, Feb 14, 2016 at 2:25 PM, Samuli Piippo wrote: Remove direct dependency to nativesdk-dbus. Instead configure qtbase to use runtime linked dbus library, if that is found. Signed-off-by: Samuli Piippo Why? This puts a dependency on the host operating system version. Am I missing something? Currently nativesdk-qtbase does not package libQt5DBus.so, so there nothing in the SDK that actual uses dbus, but it's still built as a dependency. If "qt5: add Qml support to lupdate" patch is merged, then nativesdk-dbus would be pulled into SDK as well, although I think it's still unlikely that anyone would need it. If there is really need for it, then you can always add nativesdk-dbus to your toolchain. So why not remove libQt5Dbus.so at all, from the nativesdk? Point I'm trying make is, let's not depend on and build nativesdk-dbus if we don't need it. On nativesdk-qtbase, we want to enable dbus, because that gives us also Qt dbus tools (which don't need libdbus). -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qt5: use common PACKAGECONFIG to build examples
On 04.02.2016 13:19, Otavio Salvador wrote: On Wed, Feb 3, 2016 at 1:12 PM, Samuli Piippo wrote: Each Qt module's examples can now be enabled with PACKAGECONFIG. Replace the webkit patch with a PACKAGECONFIG option and follow common practice by not building QtWayland examples by default, those can be enabled in a .bbappend with PACKAGECONFIG += "examples" Enabling PACKAGECONFIG[examples] in qtbase, will still cause every Qt module to build their examples. Signed-off-by: Samuli Piippo Acked-by: Otavio Salvador I think in a subsequent patch, examples should all to be disabled by default. What do you think? Sorry, I don't follow. QtWayland is the only module that has examples built by default, and this disables those as well. Is there anything that's needed in a subsequent patch? -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtbase: add runtime dependency to xkeyboard-config
When qtbase is configured with xkbcommon-evdev (usually without X), make sure xkeyboard-config is installed to provide keymap database. Signed-off-by: Samuli Piippo --- recipes-qt/qt5/qtbase_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb index ce07380..794cd8e 100644 --- a/recipes-qt/qt5/qtbase_git.bb +++ b/recipes-qt/qt5/qtbase_git.bb @@ -108,7 +108,7 @@ PACKAGECONFIG[xvideo] = "-xvideo,-no-xvideo" PACKAGECONFIG[openvg] = "-openvg,-no-openvg" PACKAGECONFIG[iconv] = "-iconv,-no-iconv,virtual/libiconv" PACKAGECONFIG[xkb] = "-xkb,-no-xkb -no-xkbcommon,libxkbcommon" -PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon" +PACKAGECONFIG[xkbcommon-evdev] = "-xkbcommon-evdev,-no-xkbcommon-evdev,libxkbcommon,xkeyboard-config" PACKAGECONFIG[evdev] = "-evdev,-no-evdev" PACKAGECONFIG[mtdev] = "-mtdev,-no-mtdev,mtdev" # depends on glib -- 1.9.1 -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v2 31/31] qtquickcontrols2: initial add 5.6.0
On 10.04.2016 22:41, Andreas Müller wrote:
Signed-off-by: Andreas Müller
---
recipes-qt/qt5/qtquickcontrols2_git.bb | 15 +++
1 file changed, 15 insertions(+)
create mode 100644 recipes-qt/qt5/qtquickcontrols2_git.bb
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb
b/recipes-qt/qt5/qtquickcontrols2_git.bb
new file mode 100644
index 000..41c781e
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -0,0 +1,15 @@
+require qt5.inc
+require qt5-git.inc
+
+LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0"
+LIC_FILES_CHKSUM = " \
+file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+file://LICENSE.LGPLv3;md5=8ba7f2099d17d636d5fcc8303bb17587 \
+file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
+"
+
+DEPENDS += "qtdeclarative"
+
+FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt"
all /designer/ files should go the ${PN}-designer package, since they
are not needed in the target.
Should be added by including one more level of subfolders in qt5.inc
+
+SRCREV = "7fc567eda8a187e365f4c29c6e8f08440bf31218"
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v2 31/31] qtquickcontrols2: initial add 5.6.0
On 11.04.2016 14:09, Andreas Müller wrote:
On Mon, Apr 11, 2016 at 8:02 AM, Samuli Piippo
wrote:
On 10.04.2016 22:41, Andreas Müller wrote:
Signed-off-by: Andreas Müller
---
recipes-qt/qt5/qtquickcontrols2_git.bb | 15 +++
1 file changed, 15 insertions(+)
create mode 100644 recipes-qt/qt5/qtquickcontrols2_git.bb
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb
b/recipes-qt/qt5/qtquickcontrols2_git.bb
new file mode 100644
index 000..41c781e
--- /dev/null
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -0,0 +1,15 @@
+require qt5.inc
+require qt5-git.inc
+
+LICENSE = "GFDL-1.3 & BSD & LGPL-3.0 | GPL-3.0"
+LIC_FILES_CHKSUM = " \
+file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
+file://LICENSE.LGPLv3;md5=8ba7f2099d17d636d5fcc8303bb17587 \
+file://LICENSE.GPLv3;md5=40f9bf30e783ddc201497165dfb32afb \
+"
+
+DEPENDS += "qtdeclarative"
+
+FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt"
all /designer/ files should go the ${PN}-designer package, since they are
not needed in the target.
Should be added by including one more level of subfolders in qt5.inc
+
+SRCREV = "7fc567eda8a187e365f4c29c6e8f08440bf31218"
--
I checked the image of qtquickcontrols2 for files matching your
comment but can't find any. What files do you mean?
Andreas
Without the FILES_${PN}-qmlplugins addition, bitbake throws error:
ERROR: QA Issue: qtquickcontrols2: Files/directories were installed but
not shipped in any package:
/usr/lib/qml/Qt/labs/controls/designer/qtlabscontrols.metainfo
This should go to ${PN}-qmldesigner package, as well as all the other
files from /usr/lib/qml/Qt/labs/controls/designer/* that are now in
${PN}-qmlplugins
See FILES_${PN}-qmldesigner in qt5.inc
-samuli
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: Allow disabling SHA validation for branch
Qt releases are done from a release branch (5.x.x), which is later merged
back to a stable branch (5.x) and then removed. When a recipe is updated
to use the released SHA from the release branch, it will eventually break
when the release branch is removed. This happens because bitbake tries to
validate that given SHA is found from the given branch. Add additional
variable that can be used to disable the SHA check when branch is known
to be later removed, but SHA remains valid.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5-git.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 8a6d93e..1805551 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -3,10 +3,11 @@
QT_MODULE ?= "${BPN}"
QT_MODULE_BRANCH ?= "5.6"
+QT_MODULE_NOBRANCH ?= "0"
# each module needs to define valid SRCREV
SRC_URI = " \
-
${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL}
\
+
${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};nobranch=${QT_MODULE_NOBRANCH};branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL}
\
"
S = "${WORKDIR}/git"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: add one more subfolder for ${PN}-qmldesigner
QtQuickControls2 has deeper folder structure, make sure that files
go to correct packages.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc | 1 +
recipes-qt/qt5/qtquickcontrols2_git.bb | 2 --
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 85d7d89..d3dc5f1 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -92,6 +92,7 @@ FILES_${PN}-plugins-dbg = " \
FILES_${PN}-qmldesigner += " \
${OE_QMAKE_PATH_QML}/*/designer \
${OE_QMAKE_PATH_QML}/*/*/designer \
+${OE_QMAKE_PATH_QML}/*/*/*/designer \
"
# qmlplugins 1-4 levels of subdirs qmldir + *{.so,*.qmltypes,*.qml,*js}
diff --git a/recipes-qt/qt5/qtquickcontrols2_git.bb
b/recipes-qt/qt5/qtquickcontrols2_git.bb
index 41c781e..269ffac 100644
--- a/recipes-qt/qt5/qtquickcontrols2_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols2_git.bb
@@ -10,6 +10,4 @@ LIC_FILES_CHKSUM = " \
DEPENDS += "qtdeclarative"
-FILES_${PN}-qmlplugins += "${libdir}/qt5/qml/Qt"
-
SRCREV = "7fc567eda8a187e365f4c29c6e8f08440bf31218"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCHv2] qt5: Allow disabling SHA validation for branch
Qt releases are done from a release branch (5.x.x), which is later merged
back to a stable branch (5.x) and then removed. When a recipe is updated
to use the released SHA from the release branch, it will eventually break
when the release branch is removed. This happens because bitbake tries to
validate that given SHA is found from the given branch. Add additional
variable that can be used to disable the SHA check when branch is known
to be later removed, but SHA remains valid.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5-git.inc | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index 8f88b6d..ad0abe8 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -3,10 +3,11 @@
QT_MODULE ?= "${BPN}"
QT_MODULE_BRANCH ?= "5.7"
+QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
# each module needs to define valid SRCREV
SRC_URI = " \
-
${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};branch=${QT_MODULE_BRANCH};protocol=${QT_GIT_PROTOCOL}
\
+
${QT_GIT}/${QT_MODULE}.git;name=${QT_MODULE};${QT_MODULE_BRANCH_PARAM};protocol=${QT_GIT_PROTOCOL}
\
"
S = "${WORKDIR}/git"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtvirtualkeyboard: add PACKAGECONFIG options
Add all available configurations to PACKAGECONFIGs.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qtvirtualkeyboard_git.bb | 42 -
1 file changed, 41 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index ff478f3..7e2f445 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -1,11 +1,51 @@
require qt5.inc
require qt5-git.inc
-LICENSE = "GPL-3.0"
+LICENSE = "GPL-3.0 | The-Qt-Company-Commercial"
LIC_FILES_CHKSUM = " \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
"
+# To enabled Nuance T9 Write support, you need to provide the licensed
components
+# and enable "t9write" in PACKAGECONFIG. This can be done in a separate
.bbappend file.
+# for example:
+#T9WRITEPACKAGE = "${HOME}/Downloads/zzEval_QT_T9Write_Alpha_v750_20150916.zip"
+#SRC_URI +=
"file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write"
+#PACKAGECONFIG = "t9write lang-all"
+
+PACKAGECONFIG ?= "lang-all lipi-toolkit"
+PACKAGECONFIG[hunspell] = ",CONFIG+=disable-hunspell,hunspell"
+PACKAGECONFIG[t9write] = "CONFIG+=t9write"
+PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit"
+PACKAGECONFIG[lang-all] = "CONFIG+=lang-all"
+PACKAGECONFIG[lang-ar_AR] = "CONFIG+=lang-ar_AR"
+PACKAGECONFIG[lang-da_DK] = "CONFIG+=lang-da_DK"
+PACKAGECONFIG[lang-de_DE] = "CONFIG+=lang-de_DE"
+PACKAGECONFIG[lang-en_GB] = "CONFIG+=lang-en_GB"
+PACKAGECONFIG[lang-es_ES] = "CONFIG+=lang-es_ES"
+PACKAGECONFIG[lang-fa_FA] = "CONFIG+=lang-fa_FA"
+PACKAGECONFIG[lang-fi_FI] = "CONFIG+=lang-fi_FI"
+PACKAGECONFIG[lang-fr_FR] = "CONFIG+=lang-fr_FR"
+PACKAGECONFIG[lang-hi_IN] = "CONFIG+=lang-hi_IN"
+PACKAGECONFIG[lang-it_IT] = "CONFIG+=lang-it_IT"
+PACKAGECONFIG[lang-ja_JP] = "CONFIG+=lang-ja_JP"
+PACKAGECONFIG[lang-ko_KR] = "CONFIG+=lang-ko_KR"
+PACKAGECONFIG[lang-nb_NO] = "CONFIG+=lang-nb_NO"
+PACKAGECONFIG[lang-pl_PL] = "CONFIG+=lang-pl_PL"
+PACKAGECONFIG[lang-pt_PT] = "CONFIG+=lang-pt_PT"
+PACKAGECONFIG[lang-ru_RU] = "CONFIG+=lang-ru_RU"
+PACKAGECONFIG[lang-sv_SE] = "CONFIG+=lang-sv_SE"
+PACKAGECONFIG[lang-zh_CN] = "CONFIG+=lang-zh_CN"
+PACKAGECONFIG[lang-zh_TW] = "CONFIG+=lang-zh_TW"
+
+EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
+EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '',
'CONFIG+=disable-desktop', d)}"
+
+PACKAGES += "${PN}-dictionaries"
+RRECOMMENDS_${PN} += "${PN}-dictionaries"
+FILES_${PN}-dictionaries = "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/*/*.dat"
+FILES_${PN} += "${OE_QMAKE_PATH_DATA}/qtvirtualkeyboard/lipi_toolkit"
+
DEPENDS += "qtbase qtdeclarative qtmultimedia qtquickcontrols qtsvg
qtxmlpatterns"
SRCREV = "626e78c9660cff063e1f9370538b5a424631571c"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][krogoth][PATCH] qtwayland: Fix building of QWaylandIntegration if some Qt5 features are disabled.
On 25.09.2016 12:37, Vesa Jääskeläinen wrote: On 25/09/2016 10.54, Vesa Jääskeläinen wrote: QPlatformIntegration's interface methods are disabled based on QT_NO_OPENGL, QT_NO_CLIPBOARD, QT_NO_DRAGANDDROP, QT_NO_ACCESSIBILITY and QT_NO_SESSIONMANAGER, these has to be taken into account when compiling QtWayland. Signed-off-by: Vesa Jääskeläinen --- recipes-qt/qt5/qtwayland-native_git.bb | 1 + ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 156 + recipes-qt/qt5/qtwayland_git.bb| 1 + 3 files changed, 158 insertions(+) create mode 100644 recipes-qt/qt5/qtwayland/0001-Fix-building-of-QWaylandIntegration-if-some-Qt5-feat.patch FYI: I have sent upstream PR but no response within a week: https://github.com/qt/qtwayland/pull/1 FYI: All commits to Qt modules must go through Qt Gerrit (codereview.qt-project.org), github is used only as a mirror. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5 PATCH] qmake5_paths.bbclass: Fix fonts installation path
That looks like the correct path to use, but how does this fix the problem?
OE_QMAKE_PATH_QT_FONTS doesn't seem to used anywhere in meta-qt5 any
more and probably should have been removed together with the font
packaging bits.
-samuli
On 20.10.2016 19:53, Otavio Salvador wrote:
Hello folks,
On Thu, Oct 20, 2016 at 2:46 PM, Otavio Salvador
wrote:
As Qt internal fonts (qtbase-fonts) are not included anymore, we need
to rely on system fonts to work.
All major distributions, as well as all recipes on OE-Core and
Meta-OE, use ${datadir}/fonts as path so we adapt the value for use
for Qt use as well.
Signed-off-by: Otavio Salvador
Please take a look at this. This fixes a customer which were trying to
use morty with Qt Virtual Keyboard.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213 Signed-off-by: Samuli Piippo --- classes/qmake5.bbclass | 4 - classes/qmake5_base.bbclass| 91 +++--- .../packagegroup-qt5-toolchain-target.bb | 1 - recipes-qt/qt5/nativesdk-qtbase_git.bb | 92 +- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 8 +- recipes-qt/qt5/qt3d_git.bb | 10 +- recipes-qt/qt5/qt5-git.inc | 4 +- recipes-qt/qt5/qt5.inc | 2 + recipes-qt/qt5/qtbase-native_git.bb| 30 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 314 - ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 36 --- .../0003-Add-external-hostbindir-option.patch | 154 +- ...le-Fix-pkgconfig-and-libtool-replacements.patch | 10 +- ...Invert-conditional-for-defining-QT_SOCKLE.patch | 32 --- ...configure-paths-for-target-qmake-properly.patch | 18 +- ...-unknown-features-instead-of-erroring-out.patch | 28 ++ ...EGL-libraries-from-pkgconfig-and-defaults.patch | 95 --- ...external-hostbindir-option-for-native-sdk.patch | 131 - .../qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch | 33 --- recipes-qt/qt5/qtbase_git.bb | 85 ++ recipes-qt/qt5/qtcanvas3d_git.bb | 8 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative-render2d_git.bb | 12 - ...crashes-in-QtQml-code-related-to-dead-sto.patch | 44 --- recipes-qt/qt5/qtdeclarative_git.bb| 8 +- recipes-qt/qt5/qtenginio_git.bb| 9 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 10 +- recipes-qt/qt5/qtimageformats_git.bb | 10 +- recipes-qt/qt5/qtlocation_git.bb | 10 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 4 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 6 +- recipes-qt/qt5/qtquickcontrols_git.bb | 8 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb| 10 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 10 +- recipes-qt/qt5/qtsvg_git.bb| 8 +- ...w-to-build-only-lrelease-lupdate-lconvert.patch | 6 +- recipes-qt/qt5/qttools_git.bb | 7 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb| 2 +- recipes-qt/qt5/qtwayland-native_git.bb | 31 -- ...-qtwaylandscanner-tool-to-the-native-side.patch | 29 -- ...yland-include-server-buffer-only-when-bui.patch | 27 -- recipes-qt/qt5/qtwayland_git.bb| 20 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 12 +- recipes-qt/qt5/qtwebkit-examples_git.bb| 2 +- ...move-unused-check-for-the-private_headers.patch | 35 +++ recipes-qt/qt5/qtwebkit_git.bb | 3 +- recipes-qt/qt5/qtwebsockets_git.bb | 8 +- recipes-qt/qt5/qtx11extras_git.bb | 10 +- recipes-qt/qt5/qtxmlpatterns_git.bb| 2 +- 56 files changed, 327 insertions(+), 1218 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch delete mode 100644 recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch create mode 100644 recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch delete mode 100644 recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-for-native-sdk.patch delete mode 100644 recipes-qt/qt5/qtbase
[oe] [meta-qt5][PATCHv2] Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213 Signed-off-by: Samuli Piippo --- classes/qmake5.bbclass | 4 - classes/qmake5_base.bbclass| 91 +++--- .../packagegroup-qt5-toolchain-target.bb | 1 - recipes-qt/qt5/nativesdk-qtbase_git.bb | 92 +- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 8 +- recipes-qt/qt5/qt3d_git.bb | 10 +- recipes-qt/qt5/qt5-git.inc | 4 +- recipes-qt/qt5/qt5.inc | 2 + recipes-qt/qt5/qtbase-native_git.bb| 30 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 314 - ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 36 --- .../0003-Add-external-hostbindir-option.patch | 154 +- ...le-Fix-pkgconfig-and-libtool-replacements.patch | 10 +- ...Invert-conditional-for-defining-QT_SOCKLE.patch | 32 --- ...configure-paths-for-target-qmake-properly.patch | 18 +- ...-unknown-features-instead-of-erroring-out.patch | 28 ++ ...EGL-libraries-from-pkgconfig-and-defaults.patch | 95 --- ...external-hostbindir-option-for-native-sdk.patch | 131 - .../qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch | 33 --- recipes-qt/qt5/qtbase_git.bb | 85 ++ recipes-qt/qt5/qtcanvas3d_git.bb | 8 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative-render2d_git.bb | 12 - ...crashes-in-QtQml-code-related-to-dead-sto.patch | 44 --- recipes-qt/qt5/qtdeclarative_git.bb| 8 +- recipes-qt/qt5/qtenginio_git.bb| 9 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 10 +- recipes-qt/qt5/qtimageformats_git.bb | 10 +- recipes-qt/qt5/qtlocation_git.bb | 10 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 4 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 6 +- recipes-qt/qt5/qtquickcontrols_git.bb | 8 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb| 10 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 10 +- recipes-qt/qt5/qtsvg_git.bb| 8 +- ...w-to-build-only-lrelease-lupdate-lconvert.patch | 6 +- recipes-qt/qt5/qttools_git.bb | 7 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb| 2 +- recipes-qt/qt5/qtwayland-native_git.bb | 32 --- ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 71 ++--- ...-qtwaylandscanner-tool-to-the-native-side.patch | 29 -- ...yland-include-server-buffer-only-when-bui.patch | 27 -- recipes-qt/qt5/qtwayland_git.bb| 19 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 12 +- recipes-qt/qt5/qtwebkit-examples_git.bb| 2 +- ...move-unused-check-for-the-private_headers.patch | 35 +++ recipes-qt/qt5/qtwebkit_git.bb | 3 +- recipes-qt/qt5/qtwebsockets_git.bb | 8 +- recipes-qt/qt5/qtx11extras_git.bb | 10 +- recipes-qt/qt5/qtxmlpatterns_git.bb| 2 +- 57 files changed, 344 insertions(+), 1272 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch delete mode 100644 recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch create mode 100644 recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch delete mode 100644 recipes-qt/qt5/qtbase/0012-Add-external-hostbindir-option-
Re: [oe] [meta-qt5][PATCHv2] Upgrade to Qt 5.8
On 23.11.2016 22:14, Martin Jansa wrote:
On Wed, Nov 23, 2016 at 07:52:51PM +0100, Martin Jansa wrote:
On Wed, Nov 23, 2016 at 04:43:46PM +0100, Martin Jansa wrote:
On Wed, Nov 23, 2016 at 04:29:41PM +0100, Martin Jansa wrote:
On Fri, Nov 18, 2016 at 09:48:54AM +0200, Samuli Piippo wrote:
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain
the contents of an environment value when qmake is run instead of when
Makefile is processed. All OE_QMAKE_xxx variables need to be exported
for qmake to find them. configure's setBootstrapVariable function needs
to change $$(..) to normal $(...) operator to work with qmake's Makefile.
qt.conf generation for qtbase recipes is not needed, as configure will
generate its own version based on configure arguments. Skip running
qmake, since configure is now automatically invoked when it's run in
qtbase's root folder.
Update PACKAGECONFIGs for qtbase to match current configure options.
Merge the two qtwayland recipes to one that supports all three targets
(target, native, nativesdk) without need for additional patch.
Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213
Signed-off-by: Samuli Piippo
---
...
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index e1e25ba..a1dd16a 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -2,7 +2,7 @@
# Copyright (C) 2013-2016 Martin Jansa
QT_MODULE ?= "${BPN}"
-QT_MODULE_BRANCH ?= "5.7"
+QT_MODULE_BRANCH ?= "5.8"
QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
# each module needs to define valid SRCREV
@@ -12,4 +12,4 @@ SRC_URI = " \
S = "${WORKDIR}/git"
-PV = "5.7.0+git${SRCPV}"
+PV = "5.8.0+git${SRCPV}"
This version is wrong as 5.8.0 wasn't released yet (was it?), so this PV
shouldn't sort higher then 5.8.0 release.
I'll change it to:
5.7.99+5.8.0-beta+git${SRCPV}
like I did in previous releases.
Yes, it's still in beta stage.
There is also some issue with qtwayland and qtenginio reported in:
http://lists.openembedded.org/pipermail/openembedded-devel/2016-November/110021.html
I'm trying to reproduce it with only oe-core+meta-qt5, because the qtwayland
one might be caused by bbappend in meta-luneui, but qtenginio might be
easier to reproduce.
Enginio examples are broken, as there are new checks in Qt 5.8.
Enginio is deprecated and won't be receiving much attention any more,
but build can be fixed easily with:
EXTRA_QMAKEVARS_PRE += "CONFIG+=install_ok"
Local build confirmed that qtwayland issue was caused by that bbappend,
but qtenginio error is still there and I've also noticed that with:
PACKAGECONFIG_append_pn-qtbase = " icu gl accessibility directfb examples kms"
PACKAGECONFIG_remove_pn-qtbase = "gl"
qtbase.do_compile fails with:
http://errors.yoctoproject.org/Errors/Details/107134/
and this configuration was working with 5.7 version, is directfb
unsupported now in 5.8 or does it just need some tweaks in qtbase
PACKAGECONFIGs?
directfb_egl was introduced to qtConfig in:
commit 60985aa42b37217fb4c01ed85bbf6f14410c3491
Author: Lars Knoll
Date: Fri Aug 5 13:35:39 2016 +0200
Use qtConfig throughout in qtbase
...
index d4977bf..de0344f 100644
--- a/src/plugins/platforms/directfb/directfb.pro
+++ b/src/plugins/platforms/directfb/directfb.pro
@@ -24,7 +24,7 @@ HEADERS = qdirectfbintegration.h \
qdirectfbeglhooks.h
# ### port the GL context
-contains(QT_CONFIG, directfb_egl) {
+qtConfig(directfb_egl) {
HEADERS += qdirectfb_egl.h
SOURCES += qdirectfb_egl.cpp
DEFINES += DIRECTFB_GL_EGL
But there is no directfb_egl in src/gui/configure.json
I'm not sure what's the actual status of DirectFB within Qt is, but it's
not actively developed or tested at all, and it's currently broken as
you found out.
I created bug for Qt for this: https://bugreports.qt.io/browse/QTBUG-57306
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCHv2] Upgrade to Qt 5.8
Next update to latests sha1s on all modules will again break several
things, so that will take some time to sort out.
v3 meanwhile has the 3 fixes in place.
-samuli
On Thu, Nov 24, 2016 at 12:47 PM, Martin Jansa
wrote:
> Please send v3 with all 3 fixes.
>
> On Thu, Nov 24, 2016 at 9:23 AM, Samuli Piippo
> wrote:
>
> > On 23.11.2016 22:14, Martin Jansa wrote:
> >
> >> On Wed, Nov 23, 2016 at 07:52:51PM +0100, Martin Jansa wrote:
> >>
> >>> On Wed, Nov 23, 2016 at 04:43:46PM +0100, Martin Jansa wrote:
> >>>
> >>>> On Wed, Nov 23, 2016 at 04:29:41PM +0100, Martin Jansa wrote:
> >>>>
> >>>>> On Fri, Nov 18, 2016 at 09:48:54AM +0200, Samuli Piippo wrote:
> >>>>>
> >>>>>> The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain
> >>>>>> the contents of an environment value when qmake is run instead of
> when
> >>>>>> Makefile is processed. All OE_QMAKE_xxx variables need to be
> exported
> >>>>>> for qmake to find them. configure's setBootstrapVariable function
> >>>>>> needs
> >>>>>> to change $$(..) to normal $(...) operator to work with qmake's
> >>>>>> Makefile.
> >>>>>>
> >>>>>> qt.conf generation for qtbase recipes is not needed, as configure
> will
> >>>>>> generate its own version based on configure arguments. Skip running
> >>>>>> qmake, since configure is now automatically invoked when it's run in
> >>>>>> qtbase's root folder.
> >>>>>>
> >>>>>> Update PACKAGECONFIGs for qtbase to match current configure options.
> >>>>>>
> >>>>>> Merge the two qtwayland recipes to one that supports all three
> targets
> >>>>>> (target, native, nativesdk) without need for additional patch.
> >>>>>>
> >>>>>> Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213
> >>>>>> Signed-off-by: Samuli Piippo
> >>>>>> ---
> >>>>>>
> >>>>> ...
> >>>>
> >>>>> diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
> >>>>>> index e1e25ba..a1dd16a 100644
> >>>>>> --- a/recipes-qt/qt5/qt5-git.inc
> >>>>>> +++ b/recipes-qt/qt5/qt5-git.inc
> >>>>>> @@ -2,7 +2,7 @@
> >>>>>> # Copyright (C) 2013-2016 Martin Jansa
> >>>>>>
> >>>>>> QT_MODULE ?= "${BPN}"
> >>>>>> -QT_MODULE_BRANCH ?= "5.7"
> >>>>>> +QT_MODULE_BRANCH ?= "5.8"
> >>>>>> QT_MODULE_BRANCH_PARAM ?= "branch=${QT_MODULE_BRANCH}"
> >>>>>>
> >>>>>> # each module needs to define valid SRCREV
> >>>>>> @@ -12,4 +12,4 @@ SRC_URI = " \
> >>>>>>
> >>>>>> S = "${WORKDIR}/git"
> >>>>>>
> >>>>>> -PV = "5.7.0+git${SRCPV}"
> >>>>>> +PV = "5.8.0+git${SRCPV}"
> >>>>>>
> >>>>>
> >>>>> This version is wrong as 5.8.0 wasn't released yet (was it?), so this
> >>>>> PV
> >>>>> shouldn't sort higher then 5.8.0 release.
> >>>>>
> >>>>> I'll change it to:
> >>>>> 5.7.99+5.8.0-beta+git${SRCPV}
> >>>>> like I did in previous releases.
> >>>>>
> >>>>
> > Yes, it's still in beta stage.
> >
> >
> >>>> There is also some issue with qtwayland and qtenginio reported in:
> >>>> http://lists.openembedded.org/pipermail/openembedded-devel/2
> >>>> 016-November/110021.html
> >>>>
> >>>> I'm trying to reproduce it with only oe-core+meta-qt5, because the
> >>>> qtwayland
> >>>> one might be caused by bbappend in meta-luneui, but qtenginio might be
> >>>> easier to reproduce.
> >>>>
> >>>
> > Enginio examples are broken, as there are new checks in Qt 5.8.
> > Enginio is deprecated and won't be receiving much attention any more, but
> > build can be fixed easily with:
> > EXTRA_QMAKEVARS_PRE += "CONFIG+=install_ok"
> >
> >
> >
> >&
[oe] [meta-qt5][PATCHv3] Upgrade to Qt 5.8
The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. Change-Id: Ib37c4d7323e8b45aa2b171e8427b6ec15aaee213 Signed-off-by: Samuli Piippo --- classes/qmake5.bbclass | 4 - classes/qmake5_base.bbclass| 91 +++--- .../packagegroup-qt5-toolchain-target.bb | 1 - recipes-qt/qt5/nativesdk-qtbase_git.bb | 92 +- .../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 8 +- recipes-qt/qt5/qt3d_git.bb | 10 +- recipes-qt/qt5/qt5-git.inc | 4 +- recipes-qt/qt5/qt5.inc | 2 + recipes-qt/qt5/qtbase-native_git.bb| 30 +- .../qt5/qtbase/0001-Add-linux-oe-g-platform.patch | 314 - ...o-allow-to-set-qt.conf-from-the-outside-u.patch | 36 --- .../0003-Add-external-hostbindir-option.patch | 154 +- ...le-Fix-pkgconfig-and-libtool-replacements.patch | 10 +- ...Invert-conditional-for-defining-QT_SOCKLE.patch | 32 --- ...configure-paths-for-target-qmake-properly.patch | 18 +- ...-unknown-features-instead-of-erroring-out.patch | 28 ++ ...EGL-libraries-from-pkgconfig-and-defaults.patch | 95 --- ...external-hostbindir-option-for-native-sdk.patch | 131 - .../qt5/qtbase/0012-fix-directfb-build.patch | 33 +++ .../qtbase/0013-Fix-build-with-QT_NO_OPENGL.patch | 33 --- recipes-qt/qt5/qtbase_git.bb | 86 ++ recipes-qt/qt5/qtcanvas3d_git.bb | 8 +- recipes-qt/qt5/qtcharts_git.bb | 2 +- recipes-qt/qt5/qtconnectivity_git.bb | 2 +- recipes-qt/qt5/qtdatavis3d_git.bb | 2 +- recipes-qt/qt5/qtdeclarative-render2d_git.bb | 12 - ...crashes-in-QtQml-code-related-to-dead-sto.patch | 44 --- recipes-qt/qt5/qtdeclarative_git.bb| 8 +- recipes-qt/qt5/qtenginio_git.bb| 12 +- recipes-qt/qt5/qtgraphicaleffects_git.bb | 10 +- recipes-qt/qt5/qtimageformats_git.bb | 10 +- recipes-qt/qt5/qtlocation_git.bb | 10 +- recipes-qt/qt5/qtmultimedia_git.bb | 2 +- recipes-qt/qt5/qtquick1_git.bb | 4 +- recipes-qt/qt5/qtquickcontrols2_git.bb | 6 +- recipes-qt/qt5/qtquickcontrols_git.bb | 8 +- recipes-qt/qt5/qtscript_git.bb | 2 +- recipes-qt/qt5/qtsensors_git.bb| 10 +- recipes-qt/qt5/qtserialbus_git.bb | 2 +- recipes-qt/qt5/qtserialport_git.bb | 10 +- recipes-qt/qt5/qtsvg_git.bb| 8 +- ...w-to-build-only-lrelease-lupdate-lconvert.patch | 6 +- recipes-qt/qt5/qttools_git.bb | 7 +- recipes-qt/qt5/qttranslations_git.bb | 2 +- recipes-qt/qt5/qtvirtualkeyboard_git.bb| 2 +- recipes-qt/qt5/qtwayland-native_git.bb | 32 --- ...g-of-QWaylandIntegration-if-some-Qt5-feat.patch | 71 ++--- ...-qtwaylandscanner-tool-to-the-native-side.patch | 29 -- ...yland-include-server-buffer-only-when-bui.patch | 27 -- recipes-qt/qt5/qtwayland_git.bb| 19 +- recipes-qt/qt5/qtwebchannel_git.bb | 2 +- recipes-qt/qt5/qtwebengine_git.bb | 12 +- recipes-qt/qt5/qtwebkit-examples_git.bb| 2 +- ...move-unused-check-for-the-private_headers.patch | 35 +++ recipes-qt/qt5/qtwebkit_git.bb | 3 +- recipes-qt/qt5/qtwebsockets_git.bb | 8 +- recipes-qt/qt5/qtx11extras_git.bb | 10 +- recipes-qt/qt5/qtxmlpatterns_git.bb| 2 +- 58 files changed, 381 insertions(+), 1272 deletions(-) delete mode 100644 recipes-qt/qt5/qtbase/0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch delete mode 100644 recipes-qt/qt5/qtbase/0007-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch create mode 100644 recipes-qt/qt5/qtbase/0009-Disable-all-unknown-features-instead-of-erroring-out.patch delete mode 100644 recipes-qt/qt5/qtbase/0009-Reorder-EGL-libraries-from-pkgconfig-and-defaults.patch delete mode 100644 r
Re: [oe] [meta-qt5][PATCH v4] Upgrade to Qt 5.8
Changes from v3 patch: - sha1s updated to expected RC content - fixed the qt3d assimp build-deps issue - the new Qt configuration system taken into use where applicable webengine build problem with x86_64 host and x86 target is still there. -samuli On 15.12.2016 15:48, Samuli Piippo wrote: The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. The new Qt configuration system [1] can be used with a new variable EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature arguments. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. [1] https://www.mail-archive.com/development@qt-project.org/msg25257.html -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v4] Upgrade to Qt 5.8
On 20.12.2016 16:30, Martin Jansa wrote: On Thu, Dec 15, 2016 at 04:49:55PM +0200, Samuli Piippo wrote: Changes from v3 patch: - sha1s updated to expected RC content - fixed the qt3d assimp build-deps issue - the new Qt configuration system taken into use where applicable webengine build problem with x86_64 host and x86 target is still there. This version seems to fail in qtwayland: http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161218_140914.log//2_max/failed/qtwayland.log | ERROR: Feature 'xcomposite-glx' was enabled, but the pre-condition 'features.wayland-client && features.opengl && !features.opengles2 && libs.xcomposite && libs.glx' failed. What kind of configuration is used for qtbase? To me it seems that one of these checks fail: features.opengl && !features.opengles2 Is the configure more strict in new version or do we need to change the default config for qtwayland builds? -samuli On 15.12.2016 15:48, Samuli Piippo wrote: The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. The new Qt configuration system [1] can be used with a new variable EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature arguments. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. [1] https://www.mail-archive.com/development@qt-project.org/msg25257.html -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v4] Upgrade to Qt 5.8
On 20.12.2016 17:05, Martin Jansa wrote: On Tue, Dec 20, 2016 at 04:58:49PM +0200, Samuli Piippo wrote: On 20.12.2016 16:30, Martin Jansa wrote: On Thu, Dec 15, 2016 at 04:49:55PM +0200, Samuli Piippo wrote: Changes from v3 patch: - sha1s updated to expected RC content - fixed the qt3d assimp build-deps issue - the new Qt configuration system taken into use where applicable webengine build problem with x86_64 host and x86 target is still there. This version seems to fail in qtwayland: http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161218_140914.log//2_max/failed/qtwayland.log | ERROR: Feature 'xcomposite-glx' was enabled, but the pre-condition 'features.wayland-client && features.opengl && !features.opengles2 && libs.xcomposite && libs.glx' failed. What kind of configuration is used for qtbase? To me it seems that one of these checks fail: features.opengl && !features.opengles2 The same as when building previous version of this patch. on top of meta-qt5 default there is: PACKAGECONFIG_GL = "gles2 eglfs" The gles2 here causes the failure, since xcomposite-glx checks for "!features.opengles2" This makes sense since you want to have desktop opengl enabled together with wayland GLX. PACKAGECONFIG_DISTRO = "sql-sqlite icu glib accessibility mtdev examples fontconfig" QT_CONFIG_FLAGS += "-qpa wayland-egl" from meta-luneui/recipes-qt/qt5/qtbase_git.bbappend and PACKAGECONFIG_append_pn-qtbase = " freetype fontconfig" from world_fixes.inc http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.world.qemuarm.20161217_135213.log/world_fixes.inc Is the configure more strict in new version or do we need to change the default config for qtwayland builds? -samuli On 15.12.2016 15:48, Samuli Piippo wrote: The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain the contents of an environment value when qmake is run instead of when Makefile is processed. All OE_QMAKE_xxx variables need to be exported for qmake to find them. configure's setBootstrapVariable function needs to change $$(..) to normal $(...) operator to work with qmake's Makefile. qt.conf generation for qtbase recipes is not needed, as configure will generate its own version based on configure arguments. Skip running qmake, since configure is now automatically invoked when it's run in qtbase's root folder. Update PACKAGECONFIGs for qtbase to match current configure options. The new Qt configuration system [1] can be used with a new variable EXTRA_QMAKEVARS_CONFIGURE, which takes both command line and feature arguments. Merge the two qtwayland recipes to one that supports all three targets (target, native, nativesdk) without need for additional patch. [1] https://www.mail-archive.com/development@qt-project.org/msg25257.html -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v4] Upgrade to Qt 5.8
On Mon, Jan 2, 2017 at 8:47 PM, Martin Jansa wrote:
> On Tue, Dec 20, 2016 at 05:30:11PM +0200, Samuli Piippo wrote:
>> On 20.12.2016 17:05, Martin Jansa wrote:
>> > On Tue, Dec 20, 2016 at 04:58:49PM +0200, Samuli Piippo wrote:
>> >> On 20.12.2016 16:30, Martin Jansa wrote:
>> >>> On Thu, Dec 15, 2016 at 04:49:55PM +0200, Samuli Piippo wrote:
>> >>>> Changes from v3 patch:
>> >>>> - sha1s updated to expected RC content
>> >>>> - fixed the qt3d assimp build-deps issue
>> >>>> - the new Qt configuration system taken into use where applicable
>> >>>>
>> >>>> webengine build problem with x86_64 host and x86 target is still there.
>> >>>
>> >>> This version seems to fail in qtwayland:
>> >>>
>> >>> http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.dependencies.qemuarm.20161218_140914.log//2_max/failed/qtwayland.log
>> >>>
>> >>> | ERROR: Feature 'xcomposite-glx' was enabled, but the pre-condition
>> >>> 'features.wayland-client && features.opengl && !features.opengles2 &&
>> >>> libs.xcomposite && libs.glx' failed.
>> >>
>> >> What kind of configuration is used for qtbase?
>> >> To me it seems that one of these checks fail: features.opengl &&
>> >> !features.opengles2
>> >
>> > The same as when building previous version of this patch.
>> >
>> > on top of meta-qt5 default there is:
>> >
>> > PACKAGECONFIG_GL = "gles2 eglfs"
>>
>> The gles2 here causes the failure, since xcomposite-glx checks for
>> "!features.opengles2"
>> This makes sense since you want to have desktop opengl enabled together
>> with wayland GLX.
>
> Then is it correct to enable both xcomposite-egl and xcomposite-glx for
> x11 in DISTRO_FEATUREs?
>
> Without this change in qtwayland_git.bb:
>
> -${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcompositor xkb glx',
> '', d)} \
> +${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xcomposite-egl
> xcomposite-glx', '', d)} \
>
> I can build again with that configuration.
It kind of depends what we expect the default to be.
If you have x11+opengl in DISTRO_FEATURES, then I think expectation is
to build xcb-glx plugin in qtbase and xcomposite-glx plugin in
qtwayland, which work together.
If you configure qtbase with gles2, xcb-glx won't be built and
qtwayland cannot be configured with xcomposite-glx.
Just noticed that we are missing PACKAGECONFIG[egl] in qtbase.
If that's added and if that's not used in the default PACKAGECONFIG_GL
list, we then have to remove xcomposite-egl and wayland-egl from
qtwayland defaults.
so it's also question how far we want to go with the PACKAGECONFIGs.
>
>> > PACKAGECONFIG_DISTRO = "sql-sqlite icu glib accessibility mtdev examples
>> > fontconfig"
>> >
>> > QT_CONFIG_FLAGS += "-qpa wayland-egl"
>> >
>> > from meta-luneui/recipes-qt/qt5/qtbase_git.bbappend
>> >
>> > and
>> > PACKAGECONFIG_append_pn-qtbase = " freetype fontconfig"
>> > from world_fixes.inc
>> > http://logs.nslu2-linux.org/buildlogs/oe/world/pyro/log.world.qemuarm.20161217_135213.log/world_fixes.inc
>> >>
>> >>>
>> >>> Is the configure more strict in new version or do we need to change the
>> >>> default config for qtwayland builds?
>> >>>
>> >>>>
>> >>>> -samuli
>> >>>>
>> >>>> On 15.12.2016 15:48, Samuli Piippo wrote:
>> >>>>> The linux-oe-g++ mkspec is changed to use $$(...) operator to obtain
>> >>>>> the contents of an environment value when qmake is run instead of when
>> >>>>> Makefile is processed. All OE_QMAKE_xxx variables need to be exported
>> >>>>> for qmake to find them. configure's setBootstrapVariable function needs
>> >>>>> to change $$(..) to normal $(...) operator to work with qmake's
>> >>>>> Makefile.
>> >>>>>
>> >>>>> qt.conf generation for qtbase recipes is not needed, as configure will
>> >>>>> generate its own version based on configure arguments. Skip running
>> >>>>> qmake, since configure is now automatically invoked when it's run in
>> >>&
Re: [oe] [meta-qt5][PATCH v4] Upgrade to Qt 5.8
The release date for Qt 5.8.0 is fast approaching (current target 17th of January). Would you prefer a v5 patch of this one or a new patch on top of v4? -samuli -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v4] Upgrade to Qt 5.8
The webengine bug has been reported, but it's still unresolved: https://bugreports.qt.io/browse/QTBUG-57705 On Thu, Jan 12, 2017 at 9:08 PM, Martin Jansa wrote: > v5 is fine, will you also include the fix for qtwebengine on qemux86? > > Thanks > > On Thu, Jan 12, 2017 at 12:20 PM, Samuli Piippo > wrote: > >> The release date for Qt 5.8.0 is fast approaching (current target 17th of >> January). >> Would you prefer a v5 patch of this one or a new patch on top of v4? >> >> -samuli >> >> -- >> ___ >> Openembedded-devel mailing list >> Openembedded-devel@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel >> > -- > ___ > Openembedded-devel mailing list > Openembedded-devel@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-devel -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v5] Upgrade to Qt 5.8
On Thu, Jan 26, 2017 at 2:54 PM, Martin Jansa wrote: > On Thu, Jan 26, 2017 at 11:00:59AM +0100, Johannes Pointner wrote: >> Hello, >> >> I tried to build qtbase after this update, but it failed to configure >> because of PACKAGECONFIG options which are no longer available or >> moved to another part (qtmultimedia): >> PACKAGECONFIG[mitshm] = "-mitshm,-no-mitshm,mitshm" >> >> PACKAGECONFIG[alsa] = "-alsa,-no-alsa,alsa-lib" >> PACKAGECONFIG[pulseaudio] = "-pulseaudio,-no-pulseaudio,pulseaudio" > > Yes, I'm seeing the same issue, the flags were removed in: > > commit 90c425642dfeae4564b43dacf15f80479962e910 > Merge: 1a43199 9808b53 > Author: Liang Qi > Date: Wed Nov 16 07:37:38 2016 +0100 > > Merge remote-tracking branch 'origin/5.7' into 5.8 > > but there is still PACKAGECONFIG in qtbase recipe, so this needs be > fixed in v6. The changes were part of v5, but they are now missing from the patch committed to master-next -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v5] Upgrade to Qt 5.8
On 01/26/2017 05:22 PM, Johannes Pointner wrote: Did you also see the issue with the QMAKE_INCDIR_EGL, QMAKE_LIBS_EGL and QMAKE_CFLAGS_EGL variables? What's the target and configuration you using for the build and what's the actual error you are seeing? -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH v2] qt3d: Add assimp dependency
In 5.8 (master), there is now a "system-assimp" PACKAGECONFIG option
that correctly enables/disables assimp dependency.
fatal error: assimp/Importer.hpp: No such file or directory
Is this really a fatal build error or a config test error?
In case qt3d doesn't find system assimp, it will use its internal copy
of it.
On 02/08/2017 09:43 PM, Martin Jansa wrote:
RSS:
http://git.openembedded.org/openembedded-core/commit/?id=809746f56df4b91af014bf6a3f28997d6698ac78
http://lists.openembedded.org/pipermail/openembedded-architecture/2017-January/000384.html
and following threads
For morty and older releases you need to disable autodetection in qt3d
sources when the assimp PACKAGECONFIG is not enabled (see PACKAGECONFIG in
other recipes for some examples how to do it - but for qt5 it's often
tricky as it rarely has enable/disable options usable in configure and has
to be patched).
Otherwise assimp can still be detected when it's built as a dependency of
some other recipe and might be removed from sysroot while qt3d build is
already running and causing the issues you were trying to fix.
On Wed, Feb 8, 2017 at 6:42 PM, Tom Hochstein wrote:
-Original Message-
From: openembedded-devel-boun...@lists.openembedded.org [mailto:
openembedded-devel-boun...@lists.openembedded.org] On
Behalf Of Martin Jansa
Sent: Tuesday, February 07, 2017 6:01 AM
To: openembedded-devel@lists.openembedded.org
Subject: Re: [oe] [meta-qt5][PATCH v2] qt3d: Add assimp dependency
On Fri, Jan 27, 2017 at 04:54:00PM -0600, Tom Hochstein wrote:
Fix build error:
fatal error: assimp/Importer.hpp: No such file or directory
I'm was able to build qt3d without this dependency, is there something
in your config which enabled it? Or is it autodetected from sysroot
which wont be an issue anymore with master and RSS, but your change
doesn't fix the autodetection for older branches.
We do enable assimp from another recipe.
I am unable to reproduce the original problem either.
Without the explicit dependency, it would seem that the build would at
best be non-deterministic, enabling or disabling assimp support based
solely on the timing of the Yocto tasks. I'm not aware of the technologies
you allude to. Do they provide some determinism for this case?
Signed-off-by: Tom Hochstein
---
recipes-qt/qt5/qt3d_git.bb | 1 +
1 file changed, 1 insertion(+)
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 2276c36..7c31213 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -19,6 +19,7 @@ PACKAGECONFIG ??= ""
PACKAGECONFIG_class-native ??= "tools-only"
PACKAGECONFIG_class-nativesdk ??= "tools-only"
PACKAGECONFIG[tools-only] = "CONFIG+=tools-only"
+PACKAGECONFIG[assimp] = ",,assimp"
EXTRA_QMAKEVARS_PRE += "${PACKAGECONFIG_CONFARGS}"
--
1.9.1
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
https://emea01.safelinks.protection.outlook.com/?url=http%3A%2F%2Flists.
openembedded.org%2Fmailman%2Flistinfo%2Fopenembedde
d-
devel&data=01%7C01%7Ctom.hochstein%40nxp.com%
7Cfa462298ac744a52797808d44f50f020%7C686ea1d3bc2b4c6fa92cd99c5c301635
%7C0&sdata=mLf9Lt9hQ5Rn8Ygbq7PczLY4Ix%2BscnMCbhC%2BDyUwLLM%3D&reserved=0
--
Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][rocko][PATCH] qtbase: use mysql_config from correct path
mysql_config from host sysroot is found first which gives wrong paths
for cross-compilation. Use it from crosscompile path instead.
Change-Id: Ia1e7d8e0c582016130f595b1be279255e9d0b055
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qtbase_git.bb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 0e3a8ac..db6280f 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -119,7 +119,7 @@ PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -system-xcb,-no-xcb,libxcb xcb-util-wm
xcb-util-image xcb-util-keysyms xcb-util-renderutil"
PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase"
-PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql5"
+PACKAGECONFIG[sql-mysql] = "-sql-mysql -mysql_config
${STAGING_BINDIR_CROSS}/mysql_config,-no-sql-mysql,mysql5"
PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql"
PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc"
PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci"
--
2.17.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][rocko][PATCH] qtbase: use mysql_config from correct path
only needed on rocko and older. With recipe-sysroot it works correctly.
On 19 April 2018 at 08:42, Martin Jansa wrote:
> Is it needed in sumo and master branches as well? If yes, then it should be
> applied there first.
>
> On Wed, Apr 18, 2018 at 12:04 PM, Samuli Piippo wrote:
>
>> mysql_config from host sysroot is found first which gives wrong paths
>> for cross-compilation. Use it from crosscompile path instead.
>>
>> Change-Id: Ia1e7d8e0c582016130f595b1be279255e9d0b055
>> Signed-off-by: Samuli Piippo
>> ---
>> recipes-qt/qt5/qtbase_git.bb | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
>> index 0e3a8ac..db6280f 100644
>> --- a/recipes-qt/qt5/qtbase_git.bb
>> +++ b/recipes-qt/qt5/qtbase_git.bb
>> @@ -119,7 +119,7 @@ PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
>> PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
>> PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -system-xcb,-no-xcb,libxcb
>> xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil"
>> PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase"
>> -PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql5"
>> +PACKAGECONFIG[sql-mysql] = "-sql-mysql -mysql_config
>> ${STAGING_BINDIR_CROSS}/mysql_config,-no-sql-mysql,mysql5"
>> PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql"
>> PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc"
>> PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci"
>> --
>> 2.17.0
>>
>> --
>> ___
>> Openembedded-devel mailing list
>> Openembedded-devel@lists.openembedded.org
>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][rocko][PATCH] qtbase: use mysql_config from correct path
Works with master as well; this is really needed with morty and older
OE releases, where recipe-sysroot is not used.
I was using different branches myself, hence the mix up.
On 19 April 2018 at 09:01, Martin Jansa wrote:
> RSS is used since pyro release, but you probably meant HOSTTOOLS which are
> used since rocko, but then it wouldn't be needed in rocko, only in older.
>
> Please test it with master, if it works there I'll apply it to all branches,
> because people tend to use different branch of meta-qt5 with different OE
> releases.
>
> On Thu, Apr 19, 2018 at 7:46 AM, Samuli Piippo
> wrote:
>>
>> only needed on rocko and older. With recipe-sysroot it works correctly.
>>
>> On 19 April 2018 at 08:42, Martin Jansa wrote:
>> > Is it needed in sumo and master branches as well? If yes, then it should
>> > be
>> > applied there first.
>> >
>> > On Wed, Apr 18, 2018 at 12:04 PM, Samuli Piippo
>> > wrote:
>> >
>> >> mysql_config from host sysroot is found first which gives wrong paths
>> >> for cross-compilation. Use it from crosscompile path instead.
>> >>
>> >> Change-Id: Ia1e7d8e0c582016130f595b1be279255e9d0b055
>> >> Signed-off-by: Samuli Piippo
>> >> ---
>> >> recipes-qt/qt5/qtbase_git.bb | 2 +-
>> >> 1 file changed, 1 insertion(+), 1 deletion(-)
>> >>
>> >> diff --git a/recipes-qt/qt5/qtbase_git.bb
>> >> b/recipes-qt/qt5/qtbase_git.bb
>> >> index 0e3a8ac..db6280f 100644
>> >> --- a/recipes-qt/qt5/qtbase_git.bb
>> >> +++ b/recipes-qt/qt5/qtbase_git.bb
>> >> @@ -119,7 +119,7 @@ PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
>> >> PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
>> >> PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -system-xcb,-no-xcb,libxcb
>> >> xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil"
>> >> PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase"
>> >> -PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql5"
>> >> +PACKAGECONFIG[sql-mysql] = "-sql-mysql -mysql_config
>> >> ${STAGING_BINDIR_CROSS}/mysql_config,-no-sql-mysql,mysql5"
>> >> PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql"
>> >> PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc"
>> >> PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci"
>> >> --
>> >> 2.17.0
>> >>
>> >> --
>> >> ___
>> >> Openembedded-devel mailing list
>> >> Openembedded-devel@lists.openembedded.org
>> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >>
>> > --
>> > ___
>> > Openembedded-devel mailing list
>> > Openembedded-devel@lists.openembedded.org
>> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][rocko][PATCH] qtbase: use mysql_config from correct path
mysql5 dependency builds mariadb-native, which also provides
mysql_config. Without RSS that native version is first in the PATH,
which gives incorrect configs for cross-compilation.
On 19 April 2018 at 13:49, Martin Jansa wrote:
> How does RSS influence this? I think you're still talking about HOSTTOOLS
> not RSS.
>
> On Thu, Apr 19, 2018 at 12:09 PM, Samuli Piippo
> wrote:
>>
>> Works with master as well; this is really needed with morty and older
>> OE releases, where recipe-sysroot is not used.
>> I was using different branches myself, hence the mix up.
>>
>> On 19 April 2018 at 09:01, Martin Jansa wrote:
>> > RSS is used since pyro release, but you probably meant HOSTTOOLS which
>> > are
>> > used since rocko, but then it wouldn't be needed in rocko, only in
>> > older.
>> >
>> > Please test it with master, if it works there I'll apply it to all
>> > branches,
>> > because people tend to use different branch of meta-qt5 with different
>> > OE
>> > releases.
>> >
>> > On Thu, Apr 19, 2018 at 7:46 AM, Samuli Piippo
>> > wrote:
>> >>
>> >> only needed on rocko and older. With recipe-sysroot it works correctly.
>> >>
>> >> On 19 April 2018 at 08:42, Martin Jansa wrote:
>> >> > Is it needed in sumo and master branches as well? If yes, then it
>> >> > should
>> >> > be
>> >> > applied there first.
>> >> >
>> >> > On Wed, Apr 18, 2018 at 12:04 PM, Samuli Piippo
>> >> > wrote:
>> >> >
>> >> >> mysql_config from host sysroot is found first which gives wrong
>> >> >> paths
>> >> >> for cross-compilation. Use it from crosscompile path instead.
>> >> >>
>> >> >> Change-Id: Ia1e7d8e0c582016130f595b1be279255e9d0b055
>> >> >> Signed-off-by: Samuli Piippo
>> >> >> ---
>> >> >> recipes-qt/qt5/qtbase_git.bb | 2 +-
>> >> >> 1 file changed, 1 insertion(+), 1 deletion(-)
>> >> >>
>> >> >> diff --git a/recipes-qt/qt5/qtbase_git.bb
>> >> >> b/recipes-qt/qt5/qtbase_git.bb
>> >> >> index 0e3a8ac..db6280f 100644
>> >> >> --- a/recipes-qt/qt5/qtbase_git.bb
>> >> >> +++ b/recipes-qt/qt5/qtbase_git.bb
>> >> >> @@ -119,7 +119,7 @@ PACKAGECONFIG[cups] = "-cups,-no-cups,cups"
>> >> >> PACKAGECONFIG[dbus] = "-dbus,-no-dbus,dbus"
>> >> >> PACKAGECONFIG[xcb] = "-xcb -xcb-xlib -system-xcb,-no-xcb,libxcb
>> >> >> xcb-util-wm xcb-util-image xcb-util-keysyms xcb-util-renderutil"
>> >> >> PACKAGECONFIG[sql-ibase] = "-sql-ibase,-no-sql-ibase"
>> >> >> -PACKAGECONFIG[sql-mysql] = "-sql-mysql,-no-sql-mysql,mysql5"
>> >> >> +PACKAGECONFIG[sql-mysql] = "-sql-mysql -mysql_config
>> >> >> ${STAGING_BINDIR_CROSS}/mysql_config,-no-sql-mysql,mysql5"
>> >> >> PACKAGECONFIG[sql-psql] = "-sql-psql,-no-sql-psql,postgresql"
>> >> >> PACKAGECONFIG[sql-odbc] = "-sql-odbc,-no-sql-odbc"
>> >> >> PACKAGECONFIG[sql-oci] = "-sql-oci,-no-sql-oci"
>> >> >> --
>> >> >> 2.17.0
>> >> >>
>> >> >> --
>> >> >> ___
>> >> >> Openembedded-devel mailing list
>> >> >> Openembedded-devel@lists.openembedded.org
>> >> >> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >> >>
>> >> > --
>> >> > ___
>> >> > Openembedded-devel mailing list
>> >> > Openembedded-devel@lists.openembedded.org
>> >> > http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>> >
>> >
>
>
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] nativesdk-qtbase: add quotes to CC and CXX in environment file
CC and CXX include sysroot as argument to compiler and therefore includes
spaces, which need to be quoted to work e.g., with dash.
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/nativesdk-qtbase_git.bb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb
b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 4189603..27bd563 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -186,9 +186,9 @@ fakeroot do_generate_qt_environment_file() {
echo 'export OE_QMAKE_CFLAGS="$CFLAGS"' >> $script
echo 'export OE_QMAKE_CXXFLAGS="$CXXFLAGS"' >> $script
echo 'export OE_QMAKE_LDFLAGS="$LDFLAGS"' >> $script
-echo 'export OE_QMAKE_CC=$CC' >> $script
-echo 'export OE_QMAKE_CXX=$CXX' >> $script
-echo 'export OE_QMAKE_LINK=$CXX' >> $script
+echo 'export OE_QMAKE_CC="$CC"' >> $script
+echo 'export OE_QMAKE_CXX="$CXX"' >> $script
+echo 'export OE_QMAKE_LINK="$CXX"' >> $script
echo 'export OE_QMAKE_AR=$AR' >> $script
echo 'export OE_QMAKE_STRIP=$STRIP' >> $script
echo 'export QT_CONF_PATH=${OE_QMAKE_PATH_HOST_BINS}/qt.conf' >> $script
--
2.17.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qtbase: don't pass empty filename to function
The environment variable is empty when running qmake from SDK or
in device, which gives 'Empty filename passed to function' warning.
Signed-off-by: Samuli Piippo
---
...3-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
index d0d5390..83011d6 100644
---
a/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
+++
b/recipes-qt/qt5/qtbase/0003-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch
@@ -29,7 +29,7 @@ index 422d08f..a59df4f 100644
-QString qtconfig = qmake_libraryInfoFile();
+QByteArray config = getenv("OE_QMAKE_QTCONF_PATH");
+QString qtconfig = QFile::decodeName(config);
-+if(!QFile::exists(qtconfig))
++if(qtconfig.isEmpty() || !QFile::exists(qtconfig))
+qtconfig = qmake_libraryInfoFile();
if (QFile::exists(qtconfig))
return new QSettings(qtconfig, QSettings::IniFormat);
--
2.17.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: add common PACKAGECONFIG for QtQuickCompiler
The previously commercial-only QtQuickCompiler is now merged into
qtdeclarative. Add common PACKECONFIG which can be used to enable
it, and by default enable it for Qt Charts and Qt VirtualKeyboard.
https://doc-snapshots.qt.io/qt5-5.11/qtquick-deployment.html#compiling-qml-ahead-of-time
Signed-off-by: Samuli Piippo
---
recipes-qt/qt5/qt5.inc | 2 ++
recipes-qt/qt5/qtcharts_git.bb | 2 ++
recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +-
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/recipes-qt/qt5/qt5.inc b/recipes-qt/qt5/qt5.inc
index 95e3854..edae572 100644
--- a/recipes-qt/qt5/qt5.inc
+++ b/recipes-qt/qt5/qt5.inc
@@ -7,8 +7,10 @@ PACKAGECONFIG_OPENSSL ?= "openssl"
PACKAGECONFIG[examples] = ""
PACKAGECONFIG[tests] = ""
+PACKAGECONFIG[qtquickcompiler] = ",,qtdeclarative-native"
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'examples',
'QT_BUILD_PARTS+=examples', '', d)}"
EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG', 'tests',
'QT_BUILD_PARTS+=tests', '', d)}"
+EXTRA_QMAKEVARS_PRE += "${@bb.utils.contains('PACKAGECONFIG',
'qtquickcompiler', 'CONFIG+=qtquickcompiler', '', d)}"
# we don't want conflicts with qt4
OE_QMAKE_PATH_HEADERS = "${OE_QMAKE_PATH_QT_HEADERS}"
diff --git a/recipes-qt/qt5/qtcharts_git.bb b/recipes-qt/qt5/qtcharts_git.bb
index 8ef6826..c360ecf 100644
--- a/recipes-qt/qt5/qtcharts_git.bb
+++ b/recipes-qt/qt5/qtcharts_git.bb
@@ -13,3 +13,5 @@ SRCREV = "d3f9275cbaa6a6059298ec248dd28dd6ef065e51"
# The same issue as in qtbase:
# http://errors.yoctoproject.org/Errors/Details/152641/
LDFLAGS_append_x86 = "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '
-fuse-ld=bfd ', '', d)}"
+
+PACKAGECONFIG ?= "qtquickcompiler"
diff --git a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
index f8759f1..fbacf93 100644
--- a/recipes-qt/qt5/qtvirtualkeyboard_git.bb
+++ b/recipes-qt/qt5/qtvirtualkeyboard_git.bb
@@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = " \
#SRC_URI +=
"file://${T9WRITEPACKAGE};subdir=git/src/virtualkeyboard/3rdparty/t9write"
#PACKAGECONFIG = "t9write lang-all"
-PACKAGECONFIG ?= "lang-all lipi-toolkit"
+PACKAGECONFIG ?= "lang-all lipi-toolkit qtquickcompiler"
PACKAGECONFIG[hunspell] = ",CONFIG+=disable-hunspell,hunspell"
PACKAGECONFIG[t9write] = "CONFIG+=t9write"
PACKAGECONFIG[lipi-toolkit] = "CONFIG+=lipi-toolkit"
--
2.17.0
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] qt5: Update to Qt 5.11.0
Add recipes for Qt OPC UA and Qt WebGL platform plugin.
---
recipes-qt/qt5/nativesdk-qtbase_git.bb| 7 +-
recipes-qt/qt5/qt3d_git.bb| 2 +-
recipes-qt/qt5/qt5-git.inc| 2 +-
recipes-qt/qt5/qtbase-native_git.bb | 3 +-
recipes-qt/qt5/qtbase_git.bb | 7 +-
recipes-qt/qt5/qtcanvas3d_git.bb | 2 +-
recipes-qt/qt5/qtcharts_git.bb| 2 +-
recipes-qt/qt5/qtconnectivity_git.bb | 2 +-
recipes-qt/qt5/qtdeclarative_git.bb | 6 +-
recipes-qt/qt5/qtgamepad_git.bb | 2 +-
recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +-
recipes-qt/qt5/qtimageformats_git.bb | 2 +-
recipes-qt/qt5/qtknx_git.bb | 2 +-
recipes-qt/qt5/qtlocation_git.bb | 10 +--
recipes-qt/qt5/qtmultimedia_git.bb| 2 +-
recipes-qt/qt5/qtopcua_git.bb | 13
recipes-qt/qt5/qtpurchasing_git.bb| 2 +-
recipes-qt/qt5/qtquickcontrols2_git.bb| 2 +-
recipes-qt/qt5/qtquickcontrols_git.bb | 2 +-
recipes-qt/qt5/qtremoteobjects_git.bb | 2 +-
recipes-qt/qt5/qtscript_git.bb| 2 +-
recipes-qt/qt5/qtscxml_git.bb | 2 +-
recipes-qt/qt5/qtsensors_git.bb | 2 +-
recipes-qt/qt5/qtserialbus_git.bb | 2 +-
recipes-qt/qt5/qtserialport_git.bb| 7 +-
recipes-qt/qt5/qtsvg_git.bb | 2 +-
recipes-qt/qt5/qttools_git.bb | 2 +-
recipes-qt/qt5/qtvirtualkeyboard_git.bb | 2 +-
...01-fix-build-without-xkbcommon-evdev.patch | 68 ---
recipes-qt/qt5/qtwayland_git.bb | 9 +--
recipes-qt/qt5/qtwebchannel_git.bb| 2 +-
recipes-qt/qt5/qtwebengine_git.bb | 4 +-
recipes-qt/qt5/qtwebglplugin_git.bb | 21 ++
recipes-qt/qt5/qtwebsockets_git.bb| 2 +-
recipes-qt/qt5/qtwebview_git.bb | 2 +-
recipes-qt/qt5/qtx11extras_git.bb | 2 +-
recipes-qt/qt5/qtxmlpatterns_git.bb | 2 +-
37 files changed, 84 insertions(+), 123 deletions(-)
create mode 100644 recipes-qt/qt5/qtopcua_git.bb
delete mode 100644
recipes-qt/qt5/qtwayland/0001-fix-build-without-xkbcommon-evdev.patch
create mode 100644 recipes-qt/qt5/qtwebglplugin_git.bb
diff --git a/recipes-qt/qt5/nativesdk-qtbase_git.bb
b/recipes-qt/qt5/nativesdk-qtbase_git.bb
index 27bd563..5971eeb 100644
--- a/recipes-qt/qt5/nativesdk-qtbase_git.bb
+++ b/recipes-qt/qt5/nativesdk-qtbase_git.bb
@@ -6,7 +6,6 @@ HOMEPAGE = "http://qt-project.org";
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0 |
The-Qt-Company-Commercial ) & ( GPL-2.0+ | LGPL-3.0 | The-Qt-Company-Commercial
)"
LIC_FILES_CHKSUM = " \
file://LICENSE.LGPL3;md5=e6a600fd5e1d9cbde2d983680233ad02 \
-file://LICENSE.LGPLv3;md5=86d02ed8764e77c1c0b194fde895a51b \
file://LICENSE.GPL2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
file://LICENSE.GPL3;md5=d32239bcb673463ab874e80d47fae504 \
file://LICENSE.GPL3-EXCEPT;md5=763d8c535a234d9a3fb682c7ecb6c073 \
@@ -174,8 +173,8 @@ do_install() {
install -m 644 ${WORKDIR}/OEQt5Toolchain.cmake
${D}${datadir}/cmake/OEToolchainConfig.cmake.d/
# Fix up absolute paths in scripts
-grep -lr /usr/bin/python ${D}${OE_QMAKE_PATH_QT_ARCHDATA}/ | \
-xargs -r sed -i -e '1s,#!.*python,#! ${USRBINPATH}/env python,'
+sed -i -e '1s,#!/usr/bin/python,#! ${USRBINPATH}/env python,' \
+${D}${OE_QMAKE_PATH_QT_ARCHDATA}/mkspecs/features/uikit/devices.py
}
fakeroot do_generate_qt_environment_file() {
@@ -210,4 +209,4 @@ fakeroot do_generate_qt_environment_file() {
do_generate_qt_environment_file[umask] = "022"
addtask generate_qt_environment_file after do_install before do_package
-SRCREV = "2b5587d901a0cc23749bf27a923d50bf0e5860d3"
+SRCREV = "6eef81ee1c82f934e14d47047d8b6103b8755321"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 6b5ddeb..07b28ac 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -36,6 +36,6 @@ do_configure_prepend() {
${S}/src/quick3d/imports/input/importsinput.pro
}
-SRCREV = "6d73c51d44d10925a05804cd8e70978f155643df"
+SRCREV = "15e863517ea37ca7ba6bcb75b078272eddbc5d37"
BBCLASSEXTEND += "native nativesdk"
diff --git a/recipes-qt/qt5/qt5-git.inc b/recipes-qt/qt5/qt5-git.inc
index ae7394c..41ad280 100644
--- a/recipes-qt/qt5/qt5-git.inc
+++ b/recipes-qt/qt5/qt5-git.inc
@@ -14,4 +14,4 @@ CVE_PRODUCT = "qt"
S = "${WORKDIR}/git"
-PV = "5.10.1+5.11-beta3+git${SRCPV}"
+PV = "5.11.0+git${SRCPV}"
diff --git a/recipes-qt/qt5/qtbase-native_git.bb
b/recipes-qt/qt5/qtbase-native_git.bb
index d6c53ad..0d7e598 100644
--- a/recipes-qt/qt5/qtbase-native_git.bb
+++ b/recipes-qt/qt5/qtbase-native_git.bb
@@ -6,7 +6,6 @@ HOMEPAGE = "http://qt-project.org";
LICENSE = "GFDL-1.3 & BSD & ( GPL-3.0 & The-Qt-Company-GPL-Exception-1.0
Re: [oe] [meta-qt5][PATCH] qt5: Update to Qt 5.11.0
On 6 June 2018 at 23:05, Martin Jansa wrote: > On Tue, May 29, 2018 at 12:25:56PM +0300, Samuli Piippo wrote: >> Add recipes for Qt OPC UA and Qt WebGL platform plugin. > > Unfortunately qtremoteobjects is causing gcc 8.1 to segfault > during the build: > http://errors.yoctoproject.org/Errors/Build/60747/ > the same with slightly older SRCREV currently in meta-qt5/master: > http://errors.yoctoproject.org/Errors/Build/60753/ > > Can you check what in qtremoteobjects is triggering that and report the > issue to gcc? We'll look into this. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qt5: Update to Qt 5.11.0
There's existing bug report for GCC that matches this problem: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=82882 It's been fixed for one case, but not for all. On 8 June 2018 at 07:21, Samuli Piippo wrote: > On 6 June 2018 at 23:05, Martin Jansa wrote: >> On Tue, May 29, 2018 at 12:25:56PM +0300, Samuli Piippo wrote: >>> Add recipes for Qt OPC UA and Qt WebGL platform plugin. >> >> Unfortunately qtremoteobjects is causing gcc 8.1 to segfault >> during the build: >> http://errors.yoctoproject.org/Errors/Build/60747/ >> the same with slightly older SRCREV currently in meta-qt5/master: >> http://errors.yoctoproject.org/Errors/Build/60753/ >> >> Can you check what in qtremoteobjects is triggering that and report the >> issue to gcc? > > We'll look into this. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qt5: Update to Qt 5.11.0
On 20 June 2018 at 14:29, Martin Jansa wrote: > 3) we cannot use nobranch=1, because that breaks AUTOREV How does it break AUTOREV? We are using nobranch=1 when testing non-released Qt versions and haven't seen issues with it. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qt5: Update to Qt 5.11.0
no, sorry, I mixed AUTOREV with something else. On 20 June 2018 at 15:19, Martin Jansa wrote: > On Wed, Jun 20, 2018 at 02:57:39PM +0300, Samuli Piippo wrote: >> On 20 June 2018 at 14:29, Martin Jansa wrote: >> > 3) we cannot use nobranch=1, because that breaks AUTOREV >> >> How does it break AUTOREV? >> We are using nobranch=1 when testing non-released Qt versions and >> haven't seen issues with it. > > And are you using AUTOREV? How is it supposed to know which branch to > track? > > -- > Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qt5: Update to Qt 5.11.0
On 20 June 2018 at 15:19, Martin Jansa wrote:
> On Wed, Jun 20, 2018 at 02:57:39PM +0300, Samuli Piippo wrote:
>> On 20 June 2018 at 14:29, Martin Jansa wrote:
>> > 3) we cannot use nobranch=1, because that breaks AUTOREV
>>
>> How does it break AUTOREV?
>> We are using nobranch=1 when testing non-released Qt versions and
>> haven't seen issues with it.
>
> And are you using AUTOREV? How is it supposed to know which branch to
> track?
Had to test this myself and I still don't see problem here.
As long as there still is "branch=${QT_MODULE_BRANCH}" in the URI,
nobranch=1 doesn't seem to make difference for AUTOREV.
It only stops the SHA1 validation, when you do have SHA1 in SRCREV.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] qt5: Update to Qt 5.11.0
That's not going to work with AUTOREV even if you don't have
nobranch=1 there, but it will make SHA1 builds work since the sha1 is
still accessible.
On 21 June 2018 at 12:03, Martin Jansa wrote:
> And how is it going to test latest revison in e.g. 5.10.1 branch which
> you've removed in upstream?
>
> On Thu, Jun 21, 2018 at 7:14 AM Samuli Piippo
> wrote:
>>
>> On 20 June 2018 at 15:19, Martin Jansa wrote:
>> > On Wed, Jun 20, 2018 at 02:57:39PM +0300, Samuli Piippo wrote:
>> >> On 20 June 2018 at 14:29, Martin Jansa wrote:
>> >> > 3) we cannot use nobranch=1, because that breaks AUTOREV
>> >>
>> >> How does it break AUTOREV?
>> >> We are using nobranch=1 when testing non-released Qt versions and
>> >> haven't seen issues with it.
>> >
>> > And are you using AUTOREV? How is it supposed to know which branch to
>> > track?
>>
>> Had to test this myself and I still don't see problem here.
>> As long as there still is "branch=${QT_MODULE_BRANCH}" in the URI,
>> nobranch=1 doesn't seem to make difference for AUTOREV.
>> It only stops the SHA1 validation, when you do have SHA1 in SRCREV.
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] Change default SRC_URI from github.com to code.qt.io
Have you been using codereview.qt-project.org as the QT_GIT previously?
refs/changes/* are gerrit and CI specific refs and are never be
mirrored to github or code.qt.io
-samuli
On 28 July 2018 at 03:03, Martin Jansa wrote:
> In the end it took 60 hours for qtbase, 10 hours for qtdeclarative..
>
> On Fri, Jul 27, 2018 at 9:21 AM Martin Jansa wrote:
>
>> One disadvantage of this is that fetching from code.qt.io seems to be
>> significantly slower than from github.com.
>>
>> One extreme case is just running in one of my old build dirs, where the
>> checkout from code.qt.io wasn't updated on premirror for quite long time
>> and now the do_fetch of qtbase is already running for 43 hours..
>>
>> Most of the time it's removing various refs from gerrit reviews:
>> $ tail
>> work/x86_64-linux/qtbase-native/5.9.6+gitAUTOINC+9c50112304-r0/temp/log.do_fetch
>> x [deleted] (none) -> refs/changes/83/75483/6
>> x [deleted] (none) -> refs/changes/83/75783/1
>> x [deleted] (none) -> refs/changes/83/75783/2
>> x [deleted] (none) -> refs/changes/83/75783/3
>> x [deleted] (none) -> refs/changes/83/75783/4
>> x [deleted] (none) -> refs/changes/83/75783/5
>> x [deleted] (none) -> refs/changes/83/75783/6
>> x [deleted] (none) -> refs/changes/83/7583/1
>> x [deleted] (none) -> refs/changes/83/76183/1
>> x [deleted] (none) -> refs/changes/83/76183/2
>>
>> and there is a lot of them:
>> $ grep -c deleted
>> work/x86_64-linux/qtbase-native/5.9.6+gitAUTOINC+9c50112304-r0/temp/log.do_fetch
>> 81174
>>
>> $ grep -c deleted.*refs/changes
>> work/x86_64-linux/qtbase-native/5.9.6+gitAUTOINC+9c50112304-r0/temp/log.do_fetch
>> 63253
>>
>> $ grep -c deleted.*refs/builds
>> work/x86_64-linux/qtbase-native/5.9.6+gitAUTOINC+9c50112304-r0/temp/log.do_fetch
>> 17921
>>
>> Yes it might be faster to delete the archive from premirror and do clone
>> from scratch, but other developers wouldn't know what to do with local
>> downloads directory.
>>
>> On Fri, Mar 2, 2018 at 5:19 PM Mikko Gronoff wrote:
>>
>>> There have been issues in the past with github qt mirror being out of
>>> sync with code.qt.io for certain module repos. Right now there's been a
>>> several days long break in update cycle for seemingly all the qt
>>> modules where content has not been pushed to the github mirror. Change
>>> the default SRC_URI to the more reliable code.qt.io.
>>>
>>> Change-Id: Ic7d3b9a82ef0ae502e99a8516ef78ca09250fd1e
>>> Signed-off-by: Mikko Gronoff
>>> Reviewed-by: Samuli Piippo
>>> ---
>>> conf/layer.conf | 4 ++--
>>> recipes-qt/examples/qt5everywheredemo_1.0.bb | 3 ++-
>>> 2 files changed, 4 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/conf/layer.conf b/conf/layer.conf
>>> index 7751ce2..f540710 100644
>>> --- a/conf/layer.conf
>>> +++ b/conf/layer.conf
>>> @@ -33,7 +33,7 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
>>>
>>> IMAGE_FEATURES[validitems] += "qtcreator-debug"
>>>
>>> -QT_GIT ?= "git://github.com/qt"
>>> -QT_LABS_GIT ?= "git://github.com/qt-labs"
>>> +QT_GIT_PROJECT ?= "qt"
>>> +QT_GIT ?= "git://code.qt.io/${QT_GIT_PROJECT}
>>> <http://code.qt.io/$%7BQT_GIT_PROJECT%7D>"
>>> QT_GIT_PROTOCOL ?= "git"
>>> QT_EDITION ?= "opensource"
>>> diff --git a/recipes-qt/examples/qt5everywheredemo_1.0.bb
>>> b/recipes-qt/examples/qt5everywheredemo_1.0.bb
>>> index dfbe4ae..36d57f1 100644
>>> --- a/recipes-qt/examples/qt5everywheredemo_1.0.bb
>>> +++ b/recipes-qt/examples/qt5everywheredemo_1.0.bb
>>> @@ -7,7 +7,8 @@ LIC_FILES_CHKSUM =
>>> "file://qml/QtDemo/main.qml;endline=39;md5=7d80863906a4bc8ffc
>>> DEPENDS = "qtdeclarative qtxmlpatterns qtgraphicaleffects qtsvg
>>> qtmultimedia"
>>>
>>> SRCREV = "35d72a2eba7456a2efc5eb8b77afbc00f69ba0ac"
>>> -SRC_URI = "${QT_LABS_GIT}/qt-labs-qt5-everywhere-demo"
>>> +QT_GIT_PROJECT = "qt-labs"
>>> +SRC_URI = "${QT_GIT}/qt5-everywhere-demo"
>>>
>>> S = "${WORKDIR}/git/QtDemo"
>>>
>>> --
>>> 2.7.4
>>>
>>> --
>>> ___
>>> Openembedded-devel mailing list
>>> Openembedded-devel@lists.openembedded.org
>>> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
>>>
>>
> --
> ___
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] Change default SRC_URI from github.com to code.qt.io
That's true, of course.
Looking at my own download/git2/ folder I can see that some of the
code.qt.io repos have refs/changes/* in them, but not all.
None of repos in code.qt.io currently have them anymore, my guess is
that at some point in time the mirroring pushed erroneously all refs
to code.qt.io instead just heads and tags.
On 30 July 2018 at 17:29, Martin Jansa wrote:
> No I wasn't using codereview.qt-project.org as QT_GIT before and even if I
> did, then bitbake fetcher wouldn't be using
> downloads/git2/code.qt.io.qt.qtbase.git directory to store it I think.
>
>
> On Mon, Jul 30, 2018 at 12:23 PM Samuli Piippo
> wrote:
>>
>> Have you been using codereview.qt-project.org as the QT_GIT previously?
>> refs/changes/* are gerrit and CI specific refs and are never be
>> mirrored to github or code.qt.io
>>
>> -samuli
>>
>> On 28 July 2018 at 03:03, Martin Jansa wrote:
>> > In the end it took 60 hours for qtbase, 10 hours for qtdeclarative..
>> >
>> > On Fri, Jul 27, 2018 at 9:21 AM Martin Jansa
>> > wrote:
>> >
>> >> One disadvantage of this is that fetching from code.qt.io seems to be
>> >> significantly slower than from github.com.
>> >>
>> >> One extreme case is just running in one of my old build dirs, where the
>> >> checkout from code.qt.io wasn't updated on premirror for quite long
>> >> time
>> >> and now the do_fetch of qtbase is already running for 43 hours..
>> >>
>> >> Most of the time it's removing various refs from gerrit reviews:
>> >> $ tail
>> >>
>> >> work/x86_64-linux/qtbase-native/5.9.6+gitAUTOINC+9c50112304-r0/temp/log.do_fetch
>> >> x [deleted] (none) -> refs/changes/83/75483/6
>> >> x [deleted] (none) -> refs/changes/83/75783/1
>> >> x [deleted] (none) -> refs/changes/83/75783/2
>> >> x [deleted] (none) -> refs/changes/83/75783/3
>> >> x [deleted] (none) -> refs/changes/83/75783/4
>> >> x [deleted] (none) -> refs/changes/83/75783/5
>> >> x [deleted] (none) -> refs/changes/83/75783/6
>> >> x [deleted] (none) -> refs/changes/83/7583/1
>> >> x [deleted] (none) -> refs/changes/83/76183/1
>> >> x [deleted] (none) -> refs/changes/83/76183/2
>> >>
>> >> and there is a lot of them:
>> >> $ grep -c deleted
>> >>
>> >> work/x86_64-linux/qtbase-native/5.9.6+gitAUTOINC+9c50112304-r0/temp/log.do_fetch
>> >> 81174
>> >>
>> >> $ grep -c deleted.*refs/changes
>> >>
>> >> work/x86_64-linux/qtbase-native/5.9.6+gitAUTOINC+9c50112304-r0/temp/log.do_fetch
>> >> 63253
>> >>
>> >> $ grep -c deleted.*refs/builds
>> >>
>> >> work/x86_64-linux/qtbase-native/5.9.6+gitAUTOINC+9c50112304-r0/temp/log.do_fetch
>> >> 17921
>> >>
>> >> Yes it might be faster to delete the archive from premirror and do
>> >> clone
>> >> from scratch, but other developers wouldn't know what to do with local
>> >> downloads directory.
>> >>
>> >> On Fri, Mar 2, 2018 at 5:19 PM Mikko Gronoff
>> >> wrote:
>> >>
>> >>> There have been issues in the past with github qt mirror being out of
>> >>> sync with code.qt.io for certain module repos. Right now there's been
>> >>> a
>> >>> several days long break in update cycle for seemingly all the qt
>> >>> modules where content has not been pushed to the github mirror. Change
>> >>> the default SRC_URI to the more reliable code.qt.io.
>> >>>
>> >>> Change-Id: Ic7d3b9a82ef0ae502e99a8516ef78ca09250fd1e
>> >>> Signed-off-by: Mikko Gronoff
>> >>> Reviewed-by: Samuli Piippo
>> >>> ---
>> >>> conf/layer.conf | 4 ++--
>> >>> recipes-qt/examples/qt5everywheredemo_1.0.bb | 3 ++-
>> >>> 2 files changed, 4 insertions(+), 3 deletions(-)
>> >>>
>> >>> diff --git a/conf/layer.conf b/conf/layer.conf
>> >>> index 7751ce2..f540710 100644
>> >>> --- a/conf/layer.conf
>> >>> +++ b/conf/layer.conf
>> >>> @@ -33,7 +33,7 @@ LICENSE_PATH += "${LAYERDIR}/licenses"
>> >>>
>> >>>
Re: [oe] [meta-qt5] [PATCH] qtxmlpatterns: add ptest
Since the code seems to be copy-pasted as is to several modules, it
really should be moved to a new .bbclass or .inc and inherited/included
in the modules that support it.
-samuli
On 22.05.2017 08:25, Huang Qiyu wrote:
Add ptest for qtxmlpatterns by using provided testsuite.
Signed-off-by: Huang Qiyu
---
recipes-qt/qt5/qtxmlpatterns/run-ptest | 5 +
recipes-qt/qt5/qtxmlpatterns_git.bb| 24
2 files changed, 29 insertions(+)
create mode 100644 recipes-qt/qt5/qtxmlpatterns/run-ptest
diff --git a/recipes-qt/qt5/qtxmlpatterns/run-ptest
b/recipes-qt/qt5/qtxmlpatterns/run-ptest
new file mode 100644
index 000..6c3f522
--- /dev/null
+++ b/recipes-qt/qt5/qtxmlpatterns/run-ptest
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+for x in ` awk '{print $1}' tst_list `;do
+./${x};
+done
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb
b/recipes-qt/qt5/qtxmlpatterns_git.bb
index c7efaf3..bc863de 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -14,8 +14,32 @@ LIC_FILES_CHKSUM = " \
file://LICENSE.FDL;md5=6d9f2a9af4c8b8c3c769f6cc1b6aaf7e \
"
+inherit ptest
+
DEPENDS += "qtbase"
SRCREV = "9f7e01b582b1bd83cc6b8a854c510871335e2e74"
BBCLASSEXTEND =+ "native nativesdk"
+
+addtask do_populate_sysroot after do_install before do_compile_ptest_base
+deltask do_compile_ptest_base
+addtask do_compile_ptest_base after do_populate_sysroot before do_install_ptest
+addtask do_install_ptest after do_compile_ptest_base before do_package
+
+do_compile_ptest() {
+cd ${S}/tests
+qmake -o Makefile tests.pro
+oe_runmake
+}
+
+fakeroot do_install_ptest() {
+mkdir -p ${D}${PTEST_PATH}
+t=${D}${PTEST_PATH}
+for var in ` find ${S}/tests/auto/ -name tst_*`; do
+if [ not ` echo ${var##*/} | grep '\.'` ]; then
+echo ${var##*/} >> ${t}/tst_list
+install -m 0644 ${var} ${t}
+fi
+done
+}
--
___
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel
[oe] [meta-qt5][PATCH] Upgrade to Qt 5.9.0
* adapt QtWebEngine recipe to use GN instead of GYP
* add QtRemoteObjects as a new Qt module
* update available QtBase configure arguments
* remove obsolete patches
* patch all .pc files to remove build paths
* include generated QML cache files in packages
* the patch "configure paths for target qmake properly" could not
be applied anymore and support must be done differently
Signed-off-by: Samuli Piippo
---
classes/qmake5_base.bbclass| 6 +-
recipes-qt/qt5/nativesdk-qtbase_git.bb | 7 +-
.../qt5/qt3d/0001-Allow-a-tools-only-build.patch | 16 +++-
recipes-qt/qt5/qt3d_git.bb | 2 +-
recipes-qt/qt5/qt5-git.inc | 4 +-
recipes-qt/qt5/qt5.inc | 10 +-
recipes-qt/qt5/qtbase-native_git.bb| 9 +-
...ake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch} | 8 +-
...le-Fix-pkgconfig-and-libtool-replacements.patch | 106 -
...ump-path-length-from-256-to-512-character.patch | 41
...configure-paths-for-target-qmake-properly.patch | 75 ---
recipes-qt/qt5/qtbase_git.bb | 13 +--
recipes-qt/qt5/qtcanvas3d_git.bb | 2 +-
recipes-qt/qt5/qtcharts_git.bb | 2 +-
recipes-qt/qt5/qtconnectivity_git.bb | 6 +-
recipes-qt/qt5/qtdatavis3d_git.bb | 2 +-
.../qtdeclarative/0002-Fix-memory-leak-in-V4.patch | 44 -
...leak-in-QQuickWindowPrivate-deliverTouchA.patch | 84
recipes-qt/qt5/qtdeclarative_git.bb| 8 +-
recipes-qt/qt5/qtenginio_git.bb| 5 -
recipes-qt/qt5/qtgamepad_git.bb| 2 +-
recipes-qt/qt5/qtgraphicaleffects_git.bb | 2 +-
recipes-qt/qt5/qtimageformats_git.bb | 2 +-
recipes-qt/qt5/qtlocation_git.bb | 9 +-
recipes-qt/qt5/qtmultimedia_git.bb | 6 +-
recipes-qt/qt5/qtnetworkauth_git.bb| 3 +-
recipes-qt/qt5/qtquick1_git.bb | 2 +-
recipes-qt/qt5/qtquickcontrols2_git.bb | 6 +-
recipes-qt/qt5/qtquickcontrols_git.bb | 7 +-
recipes-qt/qt5/qtremoteobjects_git.bb | 14 +++
recipes-qt/qt5/qtscript_git.bb | 2 +-
recipes-qt/qt5/qtscxml_git.bb | 2 +-
recipes-qt/qt5/qtsensors_git.bb| 2 +-
recipes-qt/qt5/qtserialbus_git.bb | 2 +-
recipes-qt/qt5/qtserialport_git.bb | 2 +-
recipes-qt/qt5/qtsvg_git.bb| 2 +-
...t-help-fix-linking-of-dependent-libraries.patch | 29 --
recipes-qt/qt5/qttools_git.bb | 8 +-
recipes-qt/qt5/qttranslations_git.bb | 2 +-
recipes-qt/qt5/qtvirtualkeyboard_git.bb| 2 +-
recipes-qt/qt5/qtwayland_git.bb| 6 +-
recipes-qt/qt5/qtwebchannel_git.bb | 2 +-
.../0001-Force-host-toolchain-configuration.patch | 69 ++
...se.gypi-include-atomicops_internals_x86_g.patch | 24 -
...um-workaround-for-too-long-.rps-file-name.patch | 42
...rf-Don-t-match-QMAKE_EXT_CPP-or-QMAKE_EXT.patch | 27 --
...rf-Make-sure-we-only-use-the-file-name-to.patch | 26 -
...s.prf-allow-build-for-linux-oe-g-platform.patch | 30 --
...quickwebengineview_p_p.h-add-include-QCol.patch | 23 -
...-dependency-to-QCoreApplication-translate.patch | 23 -
recipes-qt/qt5/qtwebengine_git.bb | 54 +--
recipes-qt/qt5/qtwebkit-examples_git.bb| 2 +-
.../qtwebkit/0002-Remove-TEXTREL-tag-in-x86.patch | 76 ---
recipes-qt/qt5/qtwebkit_git.bb | 3 +-
recipes-qt/qt5/qtwebsockets_git.bb | 2 +-
recipes-qt/qt5/qtx11extras_git.bb | 2 +-
recipes-qt/qt5/qtxmlpatterns_git.bb| 2 +-
57 files changed, 258 insertions(+), 711 deletions(-)
rename recipes-qt/qt5/qtbase/{0003-Add-external-hostbindir-option.patch =>
0002-cmake-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS.patch} (94%)
delete mode 100644
recipes-qt/qt5/qtbase/0004-qt_module-Fix-pkgconfig-and-libtool-replacements.patch
delete mode 100644
recipes-qt/qt5/qtbase/0008-configure-paths-for-target-qmake-properly.patch
delete mode 100644
recipes-qt/qt5/qtdeclarative/0002-Fix-memory-leak-in-V4.patch
delete mode 100644
recipes-qt/qt5/qtdeclarative/0003-fix-memory-leak-in-QQuickWindowPrivate-deliverTouchA.patch
create mode 100644 recipes-qt/qt5/qtremoteobjects_git.bb
delete mode 100644
recipes-qt/qt5/qttools/0002-assistant-help-fix-linking-of-dependent-libraries.patch
create mode 100644
recipes-qt/qt5/qtwebengine/0001-Force-host-toolchain-configuration.patch
delete mode 100644
recipes-qt/qt5/qtwebengine/0001-chromium-base.gypi-include-atomicops_internals_x86_g.patch
creat
Re: [oe] [meta-qt5][PATCH] Upgrade to Qt 5.9.0
On 01.06.2017 10:30, Daniel Mack wrote: On 05/31/2017 08:40 AM, Samuli Piippo wrote: * adapt QtWebEngine recipe to use GN instead of GYP * add QtRemoteObjects as a new Qt module * update available QtBase configure arguments * remove obsolete patches * patch all .pc files to remove build paths * include generated QML cache files in packages * the patch "configure paths for target qmake properly" could not be applied anymore and support must be done differently When trying to build qtwebengine, I get the following: | [1/330] CC base/third_party/libevent/buffer.o | FAILED: base/third_party/libevent/buffer.o | cc -MMD -MF base/third_party/libevent/buffer.o.d -I/home/daniel/src/poky/build/tmp-glibc/work/aarch64-nepos-linux/qtwebengine/5.9.0+gitAUTOINC+73f7be5b2a_aa2fdd6be3-r0/build/src/3rdparty/chromium/tools/gn/out/Release/gen -I/home/daniel/src/poky/build/tmp-glibc/work/aarch64-nepos-linux/qtwebengine/5.9.0+gitAUTOINC+73f7be5b2a_aa2fdd6be3-r0/git/src/3rdparty/chromium -I/home/daniel/src/poky/build/tmp-glibc/work/aarch64-nepos-linux/qtwebengine/5.9.0+gitAUTOINC+73f7be5b2a_aa2fdd6be3-r0/git/src/3rdparty/chromium/base/third_party/libevent/linux -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -O2 -g0 -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -pthread -pipe -fno-exceptions -D__STDC_FORMAT_MACROS -DNO_TCMALLOC -D__STDC_FORMAT_MACROS -O2 -g0 -D_FILE_OFFSET_BITS=64 -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -pthread -pipe -fno-exceptions -D__STDC_FORMAT_MACROS -DHAVE_CONFIG_H -c /home/daniel/src/poky/build/tmp-glibc/work/aarch64-nepos-linux/qtwebengine/5.9.0+gitAUTOINC+73f7be5b2a_aa2fdd6be3-r0/git/src/3rdparty/chromium/base/third_party/libevent/buffer.c -o base/third_party/libevent/buffer.o | /bin/sh: cc: command not found Parts of the chromium is built for the host and requires gcc-multilib to be installed when building on a x64 host. I should have noted that in commit message. My /usr/bin/cc is a symlink to gcc -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Re: [oe] [meta-qt5][PATCH] Upgrade to Qt 5.9.0
On 01.06.2017 15:57, Daniel Mack wrote: On 06/01/2017 02:35 PM, Samuli Piippo wrote: Parts of the chromium is built for the host and requires gcc-multilib to be installed when building on a x64 host. I should have noted that in commit message. My /usr/bin/cc is a symlink to gcc Hmm, same here, but that's not the case when when bitbake is executing it, as it modifies the PATH. OK found it. I didn't have new enough poky, so the HOSTTOOL filtering was not used. We need to find proper place to add HOSTTOOLS += "cc c++" to whitelist the needed tools for webengine. -- ___ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-devel
