qt5: bump to 5.3.1

Remove upstreamed patch.

Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Fatih Aşıcı 2014-06-27 09:19:17 +03:00 committed by Peter Korsgaard
parent a4389879cb
commit 9c169981c3
2 changed files with 1 additions and 47 deletions

View File

@ -1,5 +1,5 @@
QT5_VERSION_MAJOR = 5.3 QT5_VERSION_MAJOR = 5.3
QT5_VERSION = $(QT5_VERSION_MAJOR).0 QT5_VERSION = $(QT5_VERSION_MAJOR).1
QT5_SITE = http://download.qt-project.org/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules/ QT5_SITE = http://download.qt-project.org/official_releases/qt/$(QT5_VERSION_MAJOR)/$(QT5_VERSION)/submodules/
include $(sort $(wildcard package/qt5/*/*.mk)) include $(sort $(wildcard package/qt5/*/*.mk))

View File

@ -1,46 +0,0 @@
qt5script: Check for QtGui before building the examples
Signed-off-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
From e4453c92ee41943a3a1d67a725804a44e747f64e Mon Sep 17 00:00:00 2001
From: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Date: Wed, 16 Apr 2014 12:19:17 +0100
Subject: [PATCH] qtscript: Check for QtGui before building the examples
qsdbg and marshal examples need QtGui module. If QtGui is not installed
they fail to compile.
Change-Id: I1af6a8b39a0848c8208fe94a26ee57409dfd9b41
Reviewed-by: Vicente Olivert Riera <Vincent.Riera@imgtec.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
---
examples/script/script.pro | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/examples/script/script.pro b/examples/script/script.pro
index 3e1eae6..cc97233 100644
--- a/examples/script/script.pro
+++ b/examples/script/script.pro
@@ -1,7 +1,7 @@
TEMPLATE = subdirs
-SUBDIRS = \
- customclass \
- qsdbg
+SUBDIRS = customclass
+
+qtHaveModule(gui): SUBDIRS += qsdbg
qtHaveModule(widgets) {
SUBDIRS += \
@@ -22,8 +22,7 @@ qtHaveModule(widgets) {
}
!wince {
- SUBDIRS += \
- marshal
+ qtHaveModule(gui): SUBDIRS += marshal
}
maemo5: CONFIG += qt_example
--
1.9.1