diff options
| author | Samuel Rødal <samuel.rodal@nokia.com> | 2012-03-22 14:14:39 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-22 18:59:45 +0100 |
| commit | 63e56b90c57578b0fe1d2143a3fec08ba4d08fda (patch) | |
| tree | f218a3a314ac1be675ef3998df99d6d6dc495a4c /src/plugins/platforms/xcb | |
| parent | ce4fb74ecd742abd01561bf90cd0d3b7174e7f4b (diff) | |
Fixed QScreen::name() return value on xcb.
Previously the primary sceen number wasn't stripped before adding the
actual screen number, resulting in names such as ":0.0.0".
Change-Id: Ifbcf12dcf1c200fd6bc5e4b95a5d82483957e0d2
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins/platforms/xcb')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbscreen.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/plugins/platforms/xcb/qxcbscreen.cpp b/src/plugins/platforms/xcb/qxcbscreen.cpp index 8b66ef4603..a076dd4282 100644 --- a/src/plugins/platforms/xcb/qxcbscreen.cpp +++ b/src/plugins/platforms/xcb/qxcbscreen.cpp @@ -367,7 +367,11 @@ QPixmap QXcbScreen::grabWindow(WId window, int x, int y, int width, int height) QString QXcbScreen::name() const { - return connection()->displayName() + QLatin1String(".") + QString::number(screenNumber()); + QByteArray displayName = connection()->displayName(); + int dotPos = displayName.lastIndexOf('.'); + if (dotPos != -1) + displayName.truncate(dotPos); + return displayName + QLatin1Char('.') + QString::number(screenNumber()); } QT_END_NAMESPACE |