[meta-qt5][PATCH v2 00/11] upstreaming Qt for Device Creation changes

[meta-qt5][PATCH v2 00/11] upstreaming Qt for Device Creation changes

[Samuli Piippo]

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

[meta-qt5][PATCH v2 01/11] qt5: make populate_sdk_qt5 reusable

[Samuli Piippo]

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 <samuli.piippo@theqtcompany.com>
---
 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

Re: [meta-qt5][PATCH v2 01/11] qt5: make populate_sdk_qt5 reusable

[Jonathan Liu]

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 <samuli.piippo@theqtcompany.com>
> ---
>   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

Re: [meta-qt5][PATCH v2 01/11] qt5: make populate_sdk_qt5 reusable

[Samuli Piippo]

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 <samuli.piippo@theqtcompany.com>
>> ---
>>   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

[meta-qt5][PATCH v2 02/11] qt5: improve Qt module package handling

[Samuli Piippo]

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 <samuli.piippo@theqtcompany.com>
---
 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

[meta-qt5][PATCH v2 03/11] qt5: improve support for native and nativesdk modules

[Samuli Piippo]

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 <samuli.piippo@theqtcompany.com>
---
 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

[meta-qt5][PATCH v2 04/11] qt5: add host paths to qt.conf

[Samuli Piippo]

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 <samuli.piippo@theqtcompany.com>
---
 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

Re: [meta-qt5][PATCH v2 04/11] qt5: add host paths to qt.conf

[Jonathan Liu]

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 <samuli.piippo@theqtcompany.com>
> ---
>   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

Re: [meta-qt5][PATCH v2 04/11] qt5: add host paths to qt.conf

[Samuli Piippo]

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 <samuli.piippo@theqtcompany.com>
>> ---
>>   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

[meta-qt5][PATCH v2 05/11] qt5: disable debian auto renaming

[Samuli Piippo]

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 <samuli.piippo@theqtcompany.com>
---
 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

Re: [meta-qt5][PATCH v2 05/11] qt5: disable debian auto renaming

[Otavio Salvador]

On Tue, Aug 25, 2015 at 8:43 AM, Samuli Piippo
<samuli.piippo@theqtcompany.com> 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}.
>
> Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>

I think you could rework this to use a python function to set it for
all the packages and ease long term maintenance.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-qt5][PATCH v2 05/11] qt5: disable debian auto renaming

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1681 bytes --]

On Wed, Sep 02, 2015 at 02:07:15PM -0300, Otavio Salvador wrote:
> On Tue, Aug 25, 2015 at 8:43 AM, Samuli Piippo
> <samuli.piippo@theqtcompany.com> 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?

Regards,

> >
> > Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
> 
> I think you could rework this to use a python function to set it for
> all the packages and ease long term maintenance.
> 
> -- 
> Otavio Salvador                             O.S. Systems
> http://www.ossystems.com.br        http://code.ossystems.com.br
> Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
> -- 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]

Re: [meta-qt5][PATCH v2 05/11] qt5: disable debian auto renaming

[Otavio Salvador]

On Wed, Sep 2, 2015 at 2:25 PM, Martin Jansa <martin.jansa@gmail.com> 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
>> <samuli.piippo@theqtcompany.com> 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?

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

Re: [meta-qt5][PATCH v2 05/11] qt5: disable debian auto renaming

[Samuli Piippo]

On 02.09.2015 20:53, Otavio Salvador wrote:
> On Wed, Sep 2, 2015 at 2:25 PM, Martin Jansa <martin.jansa@gmail.com> 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
>>> <samuli.piippo@theqtcompany.com> 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.

[meta-qt5][PATCH v2 06/11] qt5: make qt5.inc reusable qt5-module.bbclass

[Samuli Piippo]

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.

Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
---
 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-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/qtsmarthome_1.0.bb b/recipes-qt/examples/qtsmarthome_1.0.bb
index 944c4dc..3af01f4 100644
--- a/recipes-qt/examples/qtsmarthome_1.0.bb
+++ b/recipes-qt/examples/qtsmarthome_1.0.bb
@@ -13,7 +13,7 @@ SRC_URI[sha256sum] = "fceaa813c33e462bad6c0383eaef81a6f6e586c15d1fa73898173b517f
 
 S = "${WORKDIR}/smarthome_src"
 
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/quitbattery_1.0.0.bb b/recipes-qt/examples/quitbattery_1.0.0.bb
index ea218d7..a8fb77d 100644
--- a/recipes-qt/examples/quitbattery_1.0.0.bb
+++ b/recipes-qt/examples/quitbattery_1.0.0.bb
@@ -12,7 +12,7 @@ SRC_URI[sha256sum] = "38dcb7630553c397f9d8a53c6411b1a6237956ed8dd4859e01487b1dd8
 
 S = "${WORKDIR}/QUItBattery_1.0.0"
 
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/examples/quitindicators_1.0.1.bb b/recipes-qt/examples/quitindicators_1.0.1.bb
index 19a861a..0377350 100644
--- a/recipes-qt/examples/quitindicators_1.0.1.bb
+++ b/recipes-qt/examples/quitindicators_1.0.1.bb
@@ -11,7 +11,7 @@ SRC_URI[sha256sum] = "db84112adbde9b6f28c129e8fb37a6912f4bc34bed18e57f570fb78ea0
 
 S = "${WORKDIR}/QUItIndicators_1.0.1"
 
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 do_install() {
     install -d ${D}${datadir}/${P}
diff --git a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
index f79dc0c..fcd7cbf 100644
--- a/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
+++ b/recipes-qt/libconnman-qt/libconnman-qt5_git.bb
@@ -1,4 +1,4 @@
-require recipes-qt/qt5/qt5.inc
+inherit qt5-module
 
 SUMMARY = "Qt Library for ConnMan"
 HOMEPAGE = "https://github.com/nemomobile/libconnman-qt"
diff --git a/recipes-qt/qt5/qt3d_git.bb b/recipes-qt/qt5/qt3d_git.bb
index 7f61271..1135d1d 100644
--- a/recipes-qt/qt5/qt3d_git.bb
+++ b/recipes-qt/qt5/qt3d_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & LGPL-3.0 & DIGIA-TPLA-2.4 | GPL-2.0"
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index f472c98..cf77a44 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
diff --git a/recipes-qt/qt5/qtconnectivity_git.bb b/recipes-qt/qt5/qtconnectivity_git.bb
index 0cb724e..187ec08 100644
--- a/recipes-qt/qt5/qtconnectivity_git.bb
+++ b/recipes-qt/qt5/qtconnectivity_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
diff --git a/recipes-qt/qt5/qtdeclarative_git.bb b/recipes-qt/qt5/qtdeclarative_git.bb
index f9689e6..5f6c4d8 100644
--- a/recipes-qt/qt5/qtdeclarative_git.bb
+++ b/recipes-qt/qt5/qtdeclarative_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtenginio_git.bb b/recipes-qt/qt5/qtenginio_git.bb
index f80e42e..84158fa 100644
--- a/recipes-qt/qt5/qtenginio_git.bb
+++ b/recipes-qt/qt5/qtenginio_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
diff --git a/recipes-qt/qt5/qtgraphicaleffects_git.bb b/recipes-qt/qt5/qtgraphicaleffects_git.bb
index 64c9a10..9d175b2 100644
--- a/recipes-qt/qt5/qtgraphicaleffects_git.bb
+++ b/recipes-qt/qt5/qtgraphicaleffects_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtimageformats_git.bb b/recipes-qt/qt5/qtimageformats_git.bb
index f3726da..5dd3bb9 100644
--- a/recipes-qt/qt5/qtimageformats_git.bb
+++ b/recipes-qt/qt5/qtimageformats_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
diff --git a/recipes-qt/qt5/qtlocation_git.bb b/recipes-qt/qt5/qtlocation_git.bb
index 963c576..c0ea2bb 100644
--- a/recipes-qt/qt5/qtlocation_git.bb
+++ b/recipes-qt/qt5/qtlocation_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
diff --git a/recipes-qt/qt5/qtmultimedia_git.bb b/recipes-qt/qt5/qtmultimedia_git.bb
index 5c05145..adec185 100644
--- a/recipes-qt/qt5/qtmultimedia_git.bb
+++ b/recipes-qt/qt5/qtmultimedia_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtquick1_git.bb b/recipes-qt/qt5/qtquick1_git.bb
index 1dcba1e..2d62570 100644
--- a/recipes-qt/qt5/qtquick1_git.bb
+++ b/recipes-qt/qt5/qtquick1_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtquickcontrols_git.bb b/recipes-qt/qt5/qtquickcontrols_git.bb
index 51db1ae..5ab10ea 100644
--- a/recipes-qt/qt5/qtquickcontrols_git.bb
+++ b/recipes-qt/qt5/qtquickcontrols_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
diff --git a/recipes-qt/qt5/qtscript_git.bb b/recipes-qt/qt5/qtscript_git.bb
index a54deb8..f650efa 100644
--- a/recipes-qt/qt5/qtscript_git.bb
+++ b/recipes-qt/qt5/qtscript_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtsensors_git.bb b/recipes-qt/qt5/qtsensors_git.bb
index 02688a6..7b39cfb 100644
--- a/recipes-qt/qt5/qtsensors_git.bb
+++ b/recipes-qt/qt5/qtsensors_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtserialport_git.bb b/recipes-qt/qt5/qtserialport_git.bb
index 5f41974..2139448 100644
--- a/recipes-qt/qt5/qtserialport_git.bb
+++ b/recipes-qt/qt5/qtserialport_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # text of LGPL_EXCEPTION.txt and LICENSE.FDL is slightly different than what
diff --git a/recipes-qt/qt5/qtsvg_git.bb b/recipes-qt/qt5/qtsvg_git.bb
index 6350e97..b13bb70 100644
--- a/recipes-qt/qt5/qtsvg_git.bb
+++ b/recipes-qt/qt5/qtsvg_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtsystems_git.bb b/recipes-qt/qt5/qtsystems_git.bb
index 781cd38..493736e 100644
--- a/recipes-qt/qt5/qtsystems_git.bb
+++ b/recipes-qt/qt5/qtsystems_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & LGPL-2.1 | GPL-3.0"
diff --git a/recipes-qt/qt5/qttools_git.bb b/recipes-qt/qt5/qttools_git.bb
index afc8984..443d58c 100644
--- a/recipes-qt/qt5/qttools_git.bb
+++ b/recipes-qt/qt5/qttools_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
diff --git a/recipes-qt/qt5/qttranslations_git.bb b/recipes-qt/qt5/qttranslations_git.bb
index 10ec1aa..b63d2aa 100644
--- a/recipes-qt/qt5/qttranslations_git.bb
+++ b/recipes-qt/qt5/qttranslations_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "(LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
diff --git a/recipes-qt/qt5/qtwayland_git.bb b/recipes-qt/qt5/qtwayland_git.bb
index 361b54a..a725404 100644
--- a/recipes-qt/qt5/qtwayland_git.bb
+++ b/recipes-qt/qt5/qtwayland_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtwebchannel_git.bb b/recipes-qt/qt5/qtwebchannel_git.bb
index 236eb47..55acae4 100644
--- a/recipes-qt/qt5/qtwebchannel_git.bb
+++ b/recipes-qt/qt5/qtwebchannel_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtwebengine_git.bb b/recipes-qt/qt5/qtwebengine_git.bb
index 2933bf7..fa0f019 100644
--- a/recipes-qt/qt5/qtwebengine_git.bb
+++ b/recipes-qt/qt5/qtwebengine_git.bb
@@ -26,7 +26,7 @@ inherit gettext
 inherit pythonnative
 inherit perlnative
 
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # To avoid trouble start with not separated build directory
diff --git a/recipes-qt/qt5/qtwebkit-examples_git.bb b/recipes-qt/qt5/qtwebkit-examples_git.bb
index 62e9612..bf0b3d6 100644
--- a/recipes-qt/qt5/qtwebkit-examples_git.bb
+++ b/recipes-qt/qt5/qtwebkit-examples_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
diff --git a/recipes-qt/qt5/qtwebkit_git.bb b/recipes-qt/qt5/qtwebkit_git.bb
index 74f98a7..d42b4f1 100644
--- a/recipes-qt/qt5/qtwebkit_git.bb
+++ b/recipes-qt/qt5/qtwebkit_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "BSD & LGPLv2+ | GPL-2.0"
diff --git a/recipes-qt/qt5/qtwebsockets_git.bb b/recipes-qt/qt5/qtwebsockets_git.bb
index b1e2951..c30b0ca 100644
--- a/recipes-qt/qt5/qtwebsockets_git.bb
+++ b/recipes-qt/qt5/qtwebsockets_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0)"
diff --git a/recipes-qt/qt5/qtx11extras_git.bb b/recipes-qt/qt5/qtx11extras_git.bb
index e73feb7..c108c10 100644
--- a/recipes-qt/qt5/qtx11extras_git.bb
+++ b/recipes-qt/qt5/qtx11extras_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 LICENSE = "GFDL-1.3 & BSD & (LGPL-2.1 & Digia-Qt-LGPL-Exception-1.1 | LGPL-3.0) | GPL-2.0"
diff --git a/recipes-qt/qt5/qtxmlpatterns_git.bb b/recipes-qt/qt5/qtxmlpatterns_git.bb
index 3c273db..66dddd2 100644
--- a/recipes-qt/qt5/qtxmlpatterns_git.bb
+++ b/recipes-qt/qt5/qtxmlpatterns_git.bb
@@ -1,4 +1,4 @@
-require qt5.inc
+inherit qt5-module
 require qt5-git.inc
 
 # There are no LGPLv3-only licensed files in this component.
-- 
1.9.1

[meta-qt5][PATCH v2 07/11] qttools: use one recipe for all compilations

[Samuli Piippo]

Instead of separate recipes for target, native and nativesdk, use
one recipe with BBCLASSEXTEND in place.

Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
---
 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..0000000
--- 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..0000000
--- 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

[meta-qt5][PATCH v2 08/11] qtbase: remove dependency to sqlite

[Samuli Piippo]

Qt defaults to bundled version of sqlite, so there is no need
to have dependency to sqlite3.

Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
---
 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

Re: [meta-qt5][PATCH v2 08/11] qtbase: remove dependency to sqlite

[Otavio Salvador]

On Tue, Aug 25, 2015 at 8:43 AM, Samuli Piippo
<samuli.piippo@theqtcompany.com> wrote:
> Qt defaults to bundled version of sqlite, so there is no need
> to have dependency to sqlite3.
>
> Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>

We should use system sqlite3; so instead we need to make it to use the
system one, not to drop the dependency.

-- 
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://code.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750

[meta-qt5][PATCH v2 09/11] qtbase: PACKAGECONFIGs for libproxy and libinput

[Samuli Piippo]

Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
---
 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

[meta-qt5][PATCH v2 10/11] qtlocation: use correct dependencies

[Samuli Piippo]

Update dependencies for QtLocation module based on the sync.profile

Signed-off-by: Samuli Piippo <samuli.piippo@theqtcompany.com>
---
 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

[meta-qt5][PATCH v2 11/11] qtwebengine: fix problem with recursive qmake call

[Samuli Piippo]

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 <samuli.piippo@theqtcompany.com>
---
 .../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 0000000..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 <samuli.piippo@theqtcompany.com>
+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