diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-13 15:28:09 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-07-13 15:28:09 (GMT) |
| commit | 650353f402d725688821b83904fe6319c8afa4da (patch) | |
| tree | 943c251676fe006e723e991bd126c002bcbb7bbd /src/opengl/qgl_win.cpp | |
| parent | 4a82d7cc185bd98ec8183fb0ccadefd3196b3ee2 (diff) | |
| parent | 754d9c2f1d0dce16017b99f766c1fa3e47b0afde (diff) | |
| download | Qt-650353f402d725688821b83904fe6319c8afa4da.zip Qt-650353f402d725688821b83904fe6319c8afa4da.tar.gz Qt-650353f402d725688821b83904fe6319c8afa4da.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt into qtwebkit-4.6-staging
Conflicts:
util/webkit/mkdist-webkit
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; |