diff options
| author | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-01 10:09:48 (GMT) |
|---|---|---|
| committer | Norwegian Rock Cat <qt-info@nokia.com> | 2009-07-01 10:09:48 (GMT) |
| commit | 6097501c9b324c08ae5b5c3dee3c64d385d3c5ac (patch) | |
| tree | b3ccf51aed15f9e9a94a502947d91128160123eb /src/opengl/qgl_win.cpp | |
| parent | 3618227de7036a091ea8187a20434470c0c792dc (diff) | |
| parent | a6e32ae1c84984041107a83db9307caffbda9849 (diff) | |
| download | Qt-6097501c9b324c08ae5b5c3dee3c64d385d3c5ac.zip Qt-6097501c9b324c08ae5b5c3dee3c64d385d3c5ac.tar.gz Qt-6097501c9b324c08ae5b5c3dee3c64d385d3c5ac.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/opengl/qgl_win.cpp')
| -rw-r--r-- | src/opengl/qgl_win.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/opengl/qgl_win.cpp b/src/opengl/qgl_win.cpp index 40b0ce7..86dd1d8 100644 --- a/src/opengl/qgl_win.cpp +++ b/src/opengl/qgl_win.cpp @@ -642,14 +642,10 @@ public: QString windowClassName = qt_getRegisteredWndClass(); if (parent && !parent->internalWinId()) parent = parent->nativeParentWidget(); - QT_WA({ - const TCHAR *cname = (TCHAR*)windowClassName.utf16(); - dmy_id = CreateWindow(cname, 0, 0, 0, 0, 1, 1, - parent ? parent->winId() : 0, 0, qWinAppInst(), 0); - } , { - dmy_id = CreateWindowA(windowClassName.toLatin1(), 0, 0, 0, 0, 1, 1, - parent ? parent->winId() : 0, 0, qWinAppInst(), 0); - }); + + dmy_id = CreateWindow((const wchar_t *)windowClassName.utf16(), + 0, 0, 0, 0, 1, 1, + parent ? parent->winId() : 0, 0, qWinAppInst(), 0); dmy_pdc = GetDC(dmy_id); PIXELFORMATDESCRIPTOR dmy_pfd; |