diff mbox

[v2,1/6] qt5: bump to 5.1.1

Message ID 20131004120957.GA5127@localhost
State Not Applicable
Headers show

Commit Message

Ezequiel Garcia Oct. 4, 2013, 12:09 p.m. UTC
Hi Fatih,

Nice work!

On Fri, Sep 20, 2013 at 08:43:10AM +0300, Fatih Aşıcı wrote:
> Following patches are removed since they are upstreamed:
>   - qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
>   - qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch
> 
> Remove "-nomake demos" from configure options since "demos" directory is
> merged into examples.
> 
> Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
> ---
>  package/qt5/qt5.mk                                 |    4 +--
>  package/qt5/qt5base/Config.in                      |    2 ++
>  ...nce-add-egl-to-CONFIG-to-get-correct-incl.patch |   32 -------------------
>  ...-Add-egl-cflags-when-opengles2-is-enabled.patch |   32 +++++++++++++++++++
>  .../qt5/qt5base/qt5base-0002-mkspecs-files.patch   |    5 +--
>  package/qt5/qt5base/qt5base.mk                     |   10 ++++--
>  package/qt5/qt5declarative/qt5declarative.mk       |    1 +
>  .../qt5jsbackend-0002-fix-uclibc.patch             |   33 --------------------
>  package/qt5/qt5quick1/qt5quick1.mk                 |    3 +-
>  9 files changed, 48 insertions(+), 74 deletions(-)
>  delete mode 100644 package/qt5/qt5base/qt5base-0001-eglconvenience-add-egl-to-CONFIG-to-get-correct-incl.patch
>  create mode 100644 package/qt5/qt5base/qt5base-0001-xcb-Add-egl-cflags-when-opengles2-is-enabled.patch
>  delete mode 100644 package/qt5/qt5jsbackend/qt5jsbackend-0002-fix-uclibc.patch
> 

I'm trying the series right now and noticed that qt5base build fails if
PNG is not enabled. Apparently, you noticed first as you already
reported this and provided a fix:

  https://bugreports.qt-project.org/browse/QTBUG-33496

Care to add this patch as well to Buildroot and push the fix upstream?

Apparently with this new version of Qt5, the examples get built: they
aren't built with the current v5.0.2.

So, it would be nice to add support to build the examples (which we
had in Qt 4.8).

I think embedded developers might find examples of great use: I use them to
quickly check the hardware support is OK (test touchscreen, the buttons,
and so on).

I would do it myself, but I tried to use something like this:


And for some reason it tries to build the widgets/windowcontainer
example which depends on OpenGL. This is wrong since OpenGL is disabled.
I'm not sure what can be happening, since this example is not built in
my desktop (also non-OpenGL) Qt5 build.

Maybe you can take a look and fix? If you know the workaround to fix the
above I can try to push the patch myself.

Thanks!

Comments

Fatih Aşıcı Oct. 5, 2013, 9:21 p.m. UTC | #1
Hi,

On Friday 04 October 2013 09:09:58 Ezequiel Garcia wrote:
> I'm trying the series right now and noticed that qt5base build fails if
> PNG is not enabled. Apparently, you noticed first as you already
> reported this and provided a fix:
> 
>   https://bugreports.qt-project.org/browse/QTBUG-33496
> 
> Care to add this patch as well to Buildroot and push the fix upstream?
> 
> Apparently with this new version of Qt5, the examples get built: they
> aren't built with the current v5.0.2.
> 
> So, it would be nice to add support to build the examples (which we
> had in Qt 4.8).
> 
> I think embedded developers might find examples of great use: I use them to
> quickly check the hardware support is OK (test touchscreen, the buttons,
> and so on).
> 
> I would do it myself, but I tried to use something like this:
> 
> diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
> index 0106c2c..9585b10 100644
> --- a/package/qt5/qt5base/qt5base.mk
> +++ b/package/qt5/qt5base/qt5base.mk
> @@ -176,7 +176,6 @@ define QT5BASE_CONFIGURE_CMDS
>                 -sysroot $(STAGING_DIR) \
>                 -plugindir /usr/lib/qt/plugins \
>                 -no-rpath \
> -               -nomake examples -nomake tests \
>                 -device buildroot \
>                 -no-c++11 \
>                 $(QT5BASE_CONFIGURE_OPTS) \
> 
> And for some reason it tries to build the widgets/windowcontainer
> example which depends on OpenGL. This is wrong since OpenGL is disabled.
> I'm not sure what can be happening, since this example is not built in
> my desktop (also non-OpenGL) Qt5 build.
> 
> Maybe you can take a look and fix? If you know the workaround to fix the
> above I can try to push the patch myself.

I have sent two patches to the list for both issues. They are based on my 
patch series bumping version to 5.1.1.
diff mbox

Patch

diff --git a/package/qt5/qt5base/qt5base.mk b/package/qt5/qt5base/qt5base.mk
index 0106c2c..9585b10 100644
--- a/package/qt5/qt5base/qt5base.mk
+++ b/package/qt5/qt5base/qt5base.mk
@@ -176,7 +176,6 @@  define QT5BASE_CONFIGURE_CMDS
                -sysroot $(STAGING_DIR) \
                -plugindir /usr/lib/qt/plugins \
                -no-rpath \
-               -nomake examples -nomake tests \
                -device buildroot \
                -no-c++11 \
                $(QT5BASE_CONFIGURE_OPTS) \