qt5: version bump

QT5_VERSION = 5.1.1

QT5_SITE = http://download.qt-project.org/official_releases/qt/5.1/$(QT5_VERSION)/submodules/

QT5_VERSION = 5.2.0

QT5_SITE = http://download.qt-project.org/official_releases/qt/5.2/$(QT5_VERSION)/submodules/

include $(sort $(wildcard package/qt5/*/*.mk))

define QT5_LA_PRL_FILES_FIXUP

From cbffa1e467a4c8b9e8061364b69e250b23fb7b59 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= <fatih.asici@gmail.com>

Date: Sun, 15 Sep 2013 11:15:33 +0300

Subject: [PATCH] xcb: Add egl cflags when opengles2 is enabled

MIME-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

This patch is sent to upstream and applied:

https://qt.gitorious.org/qt/qtbase/commit/ff7b57bbb936bc86a64aa2a947fa8984adf400c8

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>

---

 src/plugins/platforms/xcb/xcb-plugin.pro |    2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/plugins/platforms/xcb/xcb-plugin.pro b/src/plugins/platforms/xcb/xcb-plugin.pro

index 8299528..bc21afe 100644

--- a/src/plugins/platforms/xcb/xcb-plugin.pro

+++ b/src/plugins/platforms/xcb/xcb-plugin.pro

@@ -73,7 +73,7 @@ contains(QT_CONFIG, xcb-render) {

 contains(QT_CONFIG, opengl) {

     contains(QT_CONFIG, opengles2) {

         DEFINES += XCB_USE_EGL

-        LIBS += -lEGL

+        CONFIG += egl

         HEADERS += qxcbeglsurface.h

         # EGL on MeeGo 1.2 Harmattan needs this macro to map EGLNativeDisplayType

-- 

1.7.10.4

egl.prf: Append egl CFLAGS to QMAKE_C[XX]FLAGS

Projects including egl in their config (e.g. with CONFIG += egl) cannot get

egl CFLAGS without this.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>

--- a/configure

+++ b/configure

@@ -4934,6 +4934,7 @@

         QMAKE_CFLAGS_EGL=`$PKG_CONFIG --cflags egl 2>/dev/null`

         QMakeVar set QMAKE_INCDIR_EGL "$QMAKE_INCDIR_EGL"

         QMakeVar set QMAKE_LIBS_EGL "$QMAKE_LIBS_EGL"

+        QMakeVar set QMAKE_CFLAGS_EGL "$QMAKE_CFLAGS_EGL"

     fi       # detect EGL support

     if compileTest qpa/egl "EGL" $QMAKE_CFLAGS_EGL $QMAKE_LIBS_EGL; then

         CFG_EGL=yes

--- a/mkspecs/features/egl.prf

+++ b/mkspecs/features/egl.prf

@@ -14,6 +14,8 @@

 } else {

     INCLUDEPATH += $$QMAKE_INCDIR_EGL

     LIBS_PRIVATE += $$QMAKE_LIBS_EGL

+    QMAKE_CFLAGS += $$QMAKE_CFLAGS_EGL

+    QMAKE_CXXFLAGS += $$QMAKE_CFLAGS_EGL

     LIBS += $$QMAKE_LFLAGS_EGL

     for(p, QMAKE_LIBDIR_EGL) {

         exists($$p):LIBS_PRIVATE += -L$$p

[PATCH] fix QtGUI build without PNG support

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

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>

---

 src/gui/kernel/qplatformtheme.cpp |    2 +-

 1 file changed, 1 insertion(+), 1 deletion(-)

Index: qt5base-5.1.1/src/gui/kernel/qplatformtheme.cpp

===================================================================

--- qt5base-5.1.1.orig/src/gui/kernel/qplatformtheme.cpp

+++ qt5base-5.1.1/src/gui/kernel/qplatformtheme.cpp

@@ -48,7 +48,7 @@

 #include <QtCore/qfileinfo.h>

 #include <qpalette.h>

 #include <qtextformat.h>

-#include <qiconloader_p.h>

+#include <private/qiconloader_p.h>

 QT_BEGIN_NAMESPACE