diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-05-28 22:36:50 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-05-28 22:36:50 (GMT) |
| commit | 47f12341450ad5a03f714340fb2b213be0126a8c (patch) | |
| tree | 935bd25b0a3c5d1bfbc284d6a6f0e9427b287953 | |
| parent | 89d3ccf6d07d6f66dd62b66c35bdfa5218afafae (diff) | |
| parent | 890ea9c9cf35e4b3f7d9ad08bd6cba76b42f407e (diff) | |
| download | Qt-47f12341450ad5a03f714340fb2b213be0126a8c.zip Qt-47f12341450ad5a03f714340fb2b213be0126a8c.tar.gz Qt-47f12341450ad5a03f714340fb2b213be0126a8c.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
| -rw-r--r-- | src/winmain/qtmain_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/winmain/qtmain_win.cpp b/src/winmain/qtmain_win.cpp index b83b324..e5b3259 100644 --- a/src/winmain/qtmain_win.cpp +++ b/src/winmain/qtmain_win.cpp @@ -110,7 +110,7 @@ int APIENTRY WinMain(HINSTANCE instance, HINSTANCE prevInstance, LPSTR /*cmdPara #if defined(Q_OS_WINCE) TCHAR uniqueAppID[256]; GetModuleFileName(0, uniqueAppID, 255); - QString uid = QString::frosmUtf16((const unsigned short *)uniqueAppID).toLower().replace(QLatin1Char('\\'), QLatin1Char('_')); + QString uid = QString::fromUtf16((const unsigned short *)uniqueAppID).toLower().replace(QLatin1Char('\\'), QLatin1Char('_')); // If there exists an other instance of this application // it will be the owner of a mutex with the unique ID. |