summaryrefslogtreecommitdiffstats
path: root/package/qt5/qt5base/qt5base-Fix-linuxfb-argument-mmsize-parsing.patch
diff options
context:
space:
mode:
authorFatih Aşıcı <fatih.asici@gmail.com>2014-05-27 09:24:05 +0300
committerPeter Korsgaard <peter@korsgaard.com>2014-05-27 13:27:57 +0200
commit6a5c818cb7b0fc76ab32b9880721eed8a76df015 (patch)
tree107f973cacf4b062df67da71f3991ef4b6a98fb7 /package/qt5/qt5base/qt5base-Fix-linuxfb-argument-mmsize-parsing.patch
parent299f89ab57d7a5df1031f6b4c28588bb878a7ddb (diff)
downloadbuildroot-6a5c818cb7b0fc76ab32b9880721eed8a76df015.tar.gz
buildroot-6a5c818cb7b0fc76ab32b9880721eed8a76df015.zip
qt5: bump to 5.3.0
Remove upstreamed patches. See http://qt-project.org/qt5/qt53 for the release information. Signed-off-by: Fatih Aşıcı <fatih.asici@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/qt5/qt5base/qt5base-Fix-linuxfb-argument-mmsize-parsing.patch')
-rw-r--r--package/qt5/qt5base/qt5base-Fix-linuxfb-argument-mmsize-parsing.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/package/qt5/qt5base/qt5base-Fix-linuxfb-argument-mmsize-parsing.patch b/package/qt5/qt5base/qt5base-Fix-linuxfb-argument-mmsize-parsing.patch
deleted file mode 100644
index 3b9811bbb8..0000000000
--- a/package/qt5/qt5base/qt5base-Fix-linuxfb-argument-mmsize-parsing.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From b1fb89055d4d1bc88b7b0b788ad8eca4f3641f9a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Peter=20K=C3=BCmmel?= <syntheticpp@gmx.net>
-Date: Fri, 7 Feb 2014 13:12:37 +0100
-Subject: [PATCH] Fix linuxfb argument 'mmsize' parsing
-
-Parse first for 'mmsize' because the regex for 'size' also fits to 'mmsize'.
-
-Task-number: QTBUG-29133
-Change-Id: Idc4950270818e496d5d94a97a172b7c780f069b1
----
- src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-index 735a43d..33a9523 100644
---- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
-@@ -333,6 +333,8 @@ bool QLinuxFbScreen::initialize()
- foreach (const QString &arg, mArgs) {
- if (arg == QLatin1String("nographicsmodeswitch"))
- doSwitchToGraphicsMode = false;
-+ else if (mmSizeRx.indexIn(arg) != -1)
-+ userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt());
- else if (sizeRx.indexIn(arg) != -1)
- userGeometry.setSize(QSize(sizeRx.cap(1).toInt(), sizeRx.cap(2).toInt()));
- else if (offsetRx.indexIn(arg) != -1)
-@@ -341,8 +343,6 @@ bool QLinuxFbScreen::initialize()
- ttyDevice = ttyRx.cap(1);
- else if (fbRx.indexIn(arg) != -1)
- fbDevice = fbRx.cap(1);
-- else if (mmSizeRx.indexIn(arg) != -1)
-- userMmSize = QSize(mmSizeRx.cap(1).toInt(), mmSizeRx.cap(2).toInt());
- }
-
- if (fbDevice.isEmpty()) {
---
-1.8.3.2
-
OpenPOWER on IntegriCloud