diff options
| author | Jonathan Liu <net147@gmail.com> | 2014-03-05 09:09:00 +1100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-03-05 19:25:24 +0100 |
| commit | 8c3c6fda694f8d86347d51978d345d476addf59f (patch) | |
| tree | f85b410eb0237ca6d9b7108300ce57c50a8066de | |
| parent | ea5d8e0c1b04719e1606d823292d0beb1bae7cc2 (diff) | |
qtbase: fix mmsize argument parsing for linuxfb plugin
Signed-off-by: Jonathan Liu <net147@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | recipes-qt/qt5/qtbase.inc | 1 | ||||
| -rw-r--r-- | recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch | 42 |
2 files changed, 43 insertions, 0 deletions
diff --git a/recipes-qt/qt5/qtbase.inc b/recipes-qt/qt5/qtbase.inc index 4fe6bd5e..98fac85c 100644 --- a/recipes-qt/qt5/qtbase.inc +++ b/recipes-qt/qt5/qtbase.inc @@ -19,6 +19,7 @@ SRC_URI += "\ file://0012-qtbase-allow-build-of-examples.patch \ file://0013-QOpenGLPaintDevice-sub-area-support.patch \ file://0014-eglfs-fix-egl-error-for-platforms-only-supporting-on.patch \ + file://0015-Fix-linuxfb-argument-mmsize-parsing.patch \ " DEPENDS += "qtbase-native" diff --git a/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch b/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch new file mode 100644 index 00000000..a31301e3 --- /dev/null +++ b/recipes-qt/qt5/qtbase/0015-Fix-linuxfb-argument-mmsize-parsing.patch @@ -0,0 +1,42 @@ +From 99979159a404df09495c8ddd6a052837f66b8739 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'. + +Upstream-Status: Backport + +Task-number: QTBUG-29133 +Change-Id: Idc4950270818e496d5d94a97a172b7c780f069b1 +Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com> +Signed-off-by: Jonathan Liu <net147@gmail.com> +--- + src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp | 4 ++-- + 1 files 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.7.1 + |