diff options
| author | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-10 01:23:09 (GMT) |
|---|---|---|
| committer | Rhys Weatherley <rhys.weatherley@nokia.com> | 2009-09-10 01:23:09 (GMT) |
| commit | e75b6b8ff49e20f1e0e48254b2180accce197caf (patch) | |
| tree | 6769f661ad7535dcd4ec5f72358d03c819b11ffb | |
| parent | baea4a79bc363e37970bcc24cd9051afa287295b (diff) | |
| parent | 9fe43c999d3d9b21836345522bb67bab38e661af (diff) | |
| download | Qt-e75b6b8ff49e20f1e0e48254b2180accce197caf.zip Qt-e75b6b8ff49e20f1e0e48254b2180accce197caf.tar.gz Qt-e75b6b8ff49e20f1e0e48254b2180accce197caf.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| -rw-r--r-- | src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index c2ae2fb..b324189 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -1202,7 +1202,7 @@ bool QDirectFBScreen::connect(const QString &displaySpec) "Unable to get screen!", result); return false; } - const QString qws_size = qgetenv("QWS_SIZE"); + const QString qws_size = QString::fromLatin1(qgetenv("QWS_SIZE")); if (!qws_size.isEmpty()) { QRegExp rx(QLatin1String("(\\d+)x(\\d+)")); if (!rx.exactMatch(qws_size)) { |