[meta-qt5][PATCH 1/2] qtbase: add glib to PACKAGECONFIG_X11

[meta-qt5][PATCH 1/2] qtbase: add glib to PACKAGECONFIG_X11

[Andreas Müller]

configure script disables gtkstyle if glib is not set. See configure section:

| # auto-detect GTK style support
| if [ "$CFG_GLIB" = "yes" -a "$CFG_QGTKSTYLE" != "no" ]; then
| ...
| elif [ "$CFG_GLIB" = "no" ]; then
|     CFG_QGTKSTYLE=no
| fi

for more details.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.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 ecaccd3..0ba8ac8 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -42,7 +42,7 @@ RDEPENDS_${PN}-tools += "perl"
 
 PACKAGECONFIG_GL ?= "${@base_contains('DISTRO_FEATURES', 'opengl', 'gl', '', d)}"
 PACKAGECONFIG_FB ?= "${@base_contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)}"
-PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor gtkstyle xkb', '', d)}"
+PACKAGECONFIG_X11 ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'xcb xvideo xsync xshape xrender xrandr xfixes xinput2 xinput xinerama xcursor glib gtkstyle xkb', '', d)}"
 PACKAGECONFIG_FONTS ?= ""
 PACKAGECONFIG_SYSTEM ?= "jpeg libpng zlib"
 PACKAGECONFIG_MULTIMEDIA ?= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
-- 
2.1.0

[meta-qt5][PATCH 2/2] qtbase: align target qmake paths

[Andreas Müller]

With this we can setup qt-creator to build/debug on target again.

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...configure-paths-for-target-qmake-properly.patch | 46 ++++++++++++++++++++++
 recipes-qt/qt5/qtbase_git.bb                       |  1 +
 2 files changed, 47 insertions(+)
 create mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch

diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
new file mode 100644
index 0000000..a20164b
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
@@ -0,0 +1,46 @@
+From ecf12f418eb3a186af0276420576bac9e7974e71 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
+Date: Wed, 4 Nov 2015 10:36:26 +0100
+Subject: [PATCH] configure paths for target qmake properly
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Inappropriate [OE specific]
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ configure | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 6f338f3..82e3ae3 100755
+--- a/configure
++++ b/configure
+@@ -3842,12 +3842,12 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
+ 
+ QT_CONFIGURE_STR_OFFSETS=
+ QT_CONFIGURE_STRS=
+-addConfStr "$CFG_SYSROOT"
++addConfStr ""
+ addConfStr "$QT_REL_HOST_BINS"
+ addConfStr "$QT_REL_HOST_LIBS"
+ addConfStr "$QT_REL_HOST_DATA"
+ addConfStr "$shortxspec"
+-addConfStr "$shortspec"
++addConfStr "$shortxspec"
+ 
+ #-------------------------------------------------------------------------------
+ # generate qconfig.cpp
+@@ -3866,7 +3866,7 @@ static const char qt_configure_installation          [12+11]    = "qt_instdate=2
+ static const char qt_configure_prefix_path_str       [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
+ #ifdef QT_BUILD_QMAKE
+ static const char qt_configure_ext_prefix_path_str   [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
+-static const char qt_configure_host_prefix_path_str  [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
++static const char qt_configure_host_prefix_path_str  [512 + 12] = "qt_hpfxpath=$QT_EXT_PREFIX";
+ #endif
+ 
+ static const short qt_configure_str_offsets[] = {
+-- 
+2.1.0
+
diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
index 0ba8ac8..3ef5923 100644
--- a/recipes-qt/qt5/qtbase_git.bb
+++ b/recipes-qt/qt5/qtbase_git.bb
@@ -26,6 +26,7 @@ SRC_URI += "\
     file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
     file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
     file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \
+    file://0011-configure-paths-for-target-qmake-properly.patch \
 "
 
 DEPENDS += "qtbase-native"
-- 
2.1.0

Re: [meta-qt5][PATCH 2/2] qtbase: align target qmake paths

[Martin Jansa]

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

On Wed, Nov 04, 2015 at 06:30:09PM +0100, Andreas Müller wrote:
> With this we can setup qt-creator to build/debug on target again.

Can we apply this change to qtbase-native and nativesdk-qtbase as well
or will it break things?

With 5.6 I was finally able to use the same patches for target qtbase
and native(sdk) with only:
    file://0008-Always-build-uic.patch \
    file://0009-Add-external-hostbindir-option-for-native-sdk.patch \
included only for native(sdk) that makes my qtbase branches in
github.com/meta-qt5/qtbase a lot easier to maintain.

If it cannot be changed for all, can we make it conditional, e.g. 
[ "$QT_CROSS_COMPILE" = "yes" ]
like in new version of:
https://github.com/meta-qt5/qtbase/commit/10283d010d7a66c485cda1e9b1c0cf7c41e358b3

?

> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> ---
>  ...configure-paths-for-target-qmake-properly.patch | 46 ++++++++++++++++++++++
>  recipes-qt/qt5/qtbase_git.bb                       |  1 +
>  2 files changed, 47 insertions(+)
>  create mode 100644 recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> 
> diff --git a/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> new file mode 100644
> index 0000000..a20164b
> --- /dev/null
> +++ b/recipes-qt/qt5/qtbase/0011-configure-paths-for-target-qmake-properly.patch
> @@ -0,0 +1,46 @@
> +From ecf12f418eb3a186af0276420576bac9e7974e71 Mon Sep 17 00:00:00 2001
> +From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com>
> +Date: Wed, 4 Nov 2015 10:36:26 +0100
> +Subject: [PATCH] configure paths for target qmake properly
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Upstream-Status: Inappropriate [OE specific]
> +
> +Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
> +---
> + configure | 6 +++---
> + 1 file changed, 3 insertions(+), 3 deletions(-)
> +
> +diff --git a/configure b/configure
> +index 6f338f3..82e3ae3 100755
> +--- a/configure
> ++++ b/configure
> +@@ -3842,12 +3842,12 @@ QT_CONFIGURE_STRS_ALL=$QT_CONFIGURE_STRS
> + 
> + QT_CONFIGURE_STR_OFFSETS=
> + QT_CONFIGURE_STRS=
> +-addConfStr "$CFG_SYSROOT"
> ++addConfStr ""
> + addConfStr "$QT_REL_HOST_BINS"
> + addConfStr "$QT_REL_HOST_LIBS"
> + addConfStr "$QT_REL_HOST_DATA"
> + addConfStr "$shortxspec"
> +-addConfStr "$shortspec"
> ++addConfStr "$shortxspec"
> + 
> + #-------------------------------------------------------------------------------
> + # generate qconfig.cpp
> +@@ -3866,7 +3866,7 @@ static const char qt_configure_installation          [12+11]    = "qt_instdate=2
> + static const char qt_configure_prefix_path_str       [512 + 12] = "qt_prfxpath=$QT_INSTALL_PREFIX";
> + #ifdef QT_BUILD_QMAKE
> + static const char qt_configure_ext_prefix_path_str   [512 + 12] = "qt_epfxpath=$QT_EXT_PREFIX";
> +-static const char qt_configure_host_prefix_path_str  [512 + 12] = "qt_hpfxpath=$QT_HOST_PREFIX";
> ++static const char qt_configure_host_prefix_path_str  [512 + 12] = "qt_hpfxpath=$QT_EXT_PREFIX";
> + #endif
> + 
> + static const short qt_configure_str_offsets[] = {
> +-- 
> +2.1.0
> +
> diff --git a/recipes-qt/qt5/qtbase_git.bb b/recipes-qt/qt5/qtbase_git.bb
> index 0ba8ac8..3ef5923 100644
> --- a/recipes-qt/qt5/qtbase_git.bb
> +++ b/recipes-qt/qt5/qtbase_git.bb
> @@ -26,6 +26,7 @@ SRC_URI += "\
>      file://0008-qmake-don-t-build-it-in-configure-but-allow-to-build.patch \
>      file://0009-linux-oe-g-Invert-conditional-for-defining-QT_SOCKLE.patch \
>      file://0010-qeglplatformscreen.cpp-reorder-headers-to-fix-build-.patch \
> +    file://0011-configure-paths-for-target-qmake-properly.patch \
>  "
>  
>  DEPENDS += "qtbase-native"
> -- 
> 2.1.0
> 
> -- 
> _______________________________________________
> 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 2/2] qtbase: align target qmake paths

[Andreas Müller]

On Wed, Nov 4, 2015 at 11:54 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> On Wed, Nov 04, 2015 at 06:30:09PM +0100, Andreas Müller wrote:
>> With this we can setup qt-creator to build/debug on target again.
>
> Can we apply this change to qtbase-native and nativesdk-qtbase as well
> or will it break things?
Have not tested but I don't expect it to work for our cross/sysroot
magic: the patch wipes all host/sysroot paths out of (target) qmake.
>
> With 5.6 I was finally able to use the same patches for target qtbase
> and native(sdk) with only:
>     file://0008-Always-build-uic.patch \
>     file://0009-Add-external-hostbindir-option-for-native-sdk.patch \
> included only for native(sdk) that makes my qtbase branches in
> github.com/meta-qt5/qtbase a lot easier to maintain.
Understood, happy and fully agreed :)
>
> If it cannot be changed for all, can we make it conditional, e.g.
> [ "$QT_CROSS_COMPILE" = "yes" ]
> like in new version of:
> https://github.com/meta-qt5/qtbase/commit/10283d010d7a66c485cda1e9b1c0cf7c41e358b3
>
Need a look into but this seems to me the path to take: handling
conditionals during build is what configure is made for :)

As you might guess: I am using qt-creator on target from time to time
for building/debugging simple projects or profiling QML - so I am very
interested in qt-creator working on target.

Andreas

Re: [meta-qt5][PATCH 2/2] qtbase: align target qmake paths

[Andreas Müller]

On Thu, Nov 5, 2015 at 12:32 AM, Andreas Müller
<schnitzeltony@googlemail.com> wrote:
> On Wed, Nov 4, 2015 at 11:54 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
>> On Wed, Nov 04, 2015 at 06:30:09PM +0100, Andreas Müller wrote:
>>> With this we can setup qt-creator to build/debug on target again.
>>
>> Can we apply this change to qtbase-native and nativesdk-qtbase as well
>> or will it break things?
> Have not tested but I don't expect it to work for our cross/sysroot
> magic: the patch wipes all host/sysroot paths out of (target) qmake.
>>
>> With 5.6 I was finally able to use the same patches for target qtbase
>> and native(sdk) with only:
>>     file://0008-Always-build-uic.patch \
>>     file://0009-Add-external-hostbindir-option-for-native-sdk.patch \
>> included only for native(sdk) that makes my qtbase branches in
>> github.com/meta-qt5/qtbase a lot easier to maintain.
> Understood, happy and fully agreed :)
>>
>> If it cannot be changed for all, can we make it conditional, e.g.
>> [ "$QT_CROSS_COMPILE" = "yes" ]
>> like in new version of:
>> https://github.com/meta-qt5/qtbase/commit/10283d010d7a66c485cda1e9b1c0cf7c41e358b3
>>
> Need a look into but this seems to me the path to take: handling
> conditionals during build is what configure is made for :)
>
> As you might guess: I am using qt-creator on target from time to time
> for building/debugging simple projects or profiling QML - so I am very
> interested in qt-creator working on target.
>
Hey Martin,

just saw that you applied this one to jethro-next - please wait with
applying to jethro. I'll send new versions for master & jethro
hopefully with same patch content with conditional modification of
configure and setting linux-g++ as mkspec because linux-oe-g++ on
target causes trouble.

Regards

Andreas

Re: [meta-qt5][PATCH 2/2] qtbase: align target qmake paths

[Martin Jansa]

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

On Thu, Nov 19, 2015 at 02:06:07PM +0100, Andreas Müller wrote:
> On Thu, Nov 5, 2015 at 12:32 AM, Andreas Müller
> <schnitzeltony@googlemail.com> wrote:
> > On Wed, Nov 4, 2015 at 11:54 PM, Martin Jansa <martin.jansa@gmail.com> wrote:
> >> On Wed, Nov 04, 2015 at 06:30:09PM +0100, Andreas Müller wrote:
> >>> With this we can setup qt-creator to build/debug on target again.
> >>
> >> Can we apply this change to qtbase-native and nativesdk-qtbase as well
> >> or will it break things?
> > Have not tested but I don't expect it to work for our cross/sysroot
> > magic: the patch wipes all host/sysroot paths out of (target) qmake.
> >>
> >> With 5.6 I was finally able to use the same patches for target qtbase
> >> and native(sdk) with only:
> >>     file://0008-Always-build-uic.patch \
> >>     file://0009-Add-external-hostbindir-option-for-native-sdk.patch \
> >> included only for native(sdk) that makes my qtbase branches in
> >> github.com/meta-qt5/qtbase a lot easier to maintain.
> > Understood, happy and fully agreed :)
> >>
> >> If it cannot be changed for all, can we make it conditional, e.g.
> >> [ "$QT_CROSS_COMPILE" = "yes" ]
> >> like in new version of:
> >> https://github.com/meta-qt5/qtbase/commit/10283d010d7a66c485cda1e9b1c0cf7c41e358b3
> >>
> > Need a look into but this seems to me the path to take: handling
> > conditionals during build is what configure is made for :)
> >
> > As you might guess: I am using qt-creator on target from time to time
> > for building/debugging simple projects or profiling QML - so I am very
> > interested in qt-creator working on target.
> >
> Hey Martin,
> 
> just saw that you applied this one to jethro-next - please wait with
> applying to jethro. I'll send new versions for master & jethro
> hopefully with same patch content with conditional modification of
> configure and setting linux-g++ as mkspec because linux-oe-g++ on
> target causes trouble.

Don't worry I wasn't planing to merge jethro-next anytime soon, it was
just to store the "jethro" applicable version somewhere until it's
resolved in master, if you send different version for jethro as well
I'll update it there.

But thanks for keeping an eye on me :).

Regards,

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

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