qt5: bump to 5.1.1

QT5_VERSION = 5.0.2

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

QT5_VERSION = 5.1.1

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

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

define QT5_LA_PRL_FILES_FIXUP

config BR2_PACKAGE_QT5BASE_WIDGETS

	bool "widgets module"

	select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_QT5BASE_XCB

	help

	  This option enables the Qt5Widgets library.

	select BR2_PACKAGE_XCB_UTIL_IMAGE

	select BR2_PACKAGE_XCB_UTIL_KEYSYMS

	select BR2_PACKAGE_XCB_UTIL_WM

	select BR2_PACKAGE_LIBXKBCOMMON

comment "X.org XCB backend available if X.org is enabled"

	depends on !BR2_PACKAGE_XORG7

From 588c60d0c3d11e79d19860fa62b03c935658d13a Mon Sep 17 00:00:00 2001

From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Date: Sun, 13 Jan 2013 14:36:48 +0100

Subject: [PATCH qtbase] eglconvenience: add egl to CONFIG to get correct include

 paths

The eglconvenience code includes <EGL/egl.h>. Therefore, it should get

the appropriate EGL-specific include paths from QMAKE_INCDIR_EGL,

otherwise the build might if the EGL library has its headers in

special locations. In order to achieve this, we simply add the "egl"

feature to the list of features imported by eglconvenience.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

---

 .../eglconvenience/eglconvenience.pri              |    1 +

 1 file changed, 1 insertion(+)

diff --git a/src/platformsupport/eglconvenience/eglconvenience.pri b/src/platformsupport/eglconvenience/eglconvenience.pri

index 188eb1c..8996cea 100644

--- a/src/platformsupport/eglconvenience/eglconvenience.pri

+++ b/src/platformsupport/eglconvenience/eglconvenience.pri

@@ -5,6 +5,7 @@ contains(QT_CONFIG,egl) {

     SOURCES += \

         $$PWD/qeglconvenience.cpp \

         $$PWD/qeglplatformcontext.cpp

+    CONFIG += egl

     contains(QT_CONFIG,xlib) {

         HEADERS += \

-- 

1.7.9.5

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

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

--- /dev/null

+++ b/mkspecs/devices/linux-buildroot-g++/qmake.conf

@@ -0,0 +1,43 @@

@@ -0,0 +1,44 @@

+MAKEFILE_GENERATOR      = UNIX

+CONFIG                 += incremental gdb_dwarf_index

+QMAKE_INCREMENTAL_STYLE = sublib

+# modifications to linux.conf

+QMAKE_AR                = $${BUILDROOT_CROSS_COMPILE}ar cqs

+QMAKE_OBJCOPY           = $${BUILDROOT_CROSS_COMPILE}objcopy

+QMAKE_NM                = $${BUILDROOT_CROSS_COMPILE}nm -P

+QMAKE_STRIP             = $${BUILDROOT_CROSS_COMPILE}strip

+

+#modifications to gcc-base.conf