diff options
| author | Peter Kümmel <syntheticpp@gmx.net> | 2014-02-07 13:12:37 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-07 16:43:23 +0100 |
| commit | 99979159a404df09495c8ddd6a052837f66b8739 (patch) | |
| tree | 7165453fa3a77c7d0b74c5c181b91624ca481f77 | |
| parent | 3f5060a60129225d8860b16953038fc9a214c1c1 (diff) | |
| download | qtbase-99979159a404df09495c8ddd6a052837f66b8739.tar.gz qtbase-99979159a404df09495c8ddd6a052837f66b8739.tar.bz2 qtbase-99979159a404df09495c8ddd6a052837f66b8739.zip | |
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
Reviewed-by: Laszlo Agocs <laszlo.agocs@digia.com>
| -rw-r--r-- | 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 735a43daf7..33a9523568 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()) { |