diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-03-23 14:09:01 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-03-23 15:49:15 (GMT) |
| commit | 6b072a0c0a756a099d8dfd7827918be5adf7bf1f (patch) | |
| tree | 4d6e92481cdf3420656604797353a91673489364 /src/corelib | |
| parent | 74ce3dea8b3ea06d61cef4e729f6a95f670461fe (diff) | |
| download | Qt-6b072a0c0a756a099d8dfd7827918be5adf7bf1f.zip Qt-6b072a0c0a756a099d8dfd7827918be5adf7bf1f.tar.gz Qt-6b072a0c0a756a099d8dfd7827918be5adf7bf1f.tar.bz2 | |
compile fix for mingw (also removes some warnings)
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qwindowspipewriter.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_win.cpp | 10 |
2 files changed, 6 insertions, 7 deletions
diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp index 394323f..da992d0 100644 --- a/src/corelib/io/qwindowspipewriter.cpp +++ b/src/corelib/io/qwindowspipewriter.cpp @@ -100,8 +100,7 @@ qint64 QWindowsPipeWriter::write(const char *ptr, qint64 maxlen) void QWindowsPipeWriter::run() { - OVERLAPPED overl = {0, 0, 0, 0, NULL}; - overl.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); + OVERLAPPED overl = {0, 0, { {0, 0 } }, CreateEvent(NULL, TRUE, FALSE, NULL)}; forever { lock.lock(); while(data.isEmpty() && (!quitNow)) { diff --git a/src/corelib/kernel/qcoreapplication_win.cpp b/src/corelib/kernel/qcoreapplication_win.cpp index 566626d..c1925e7 100644 --- a/src/corelib/kernel/qcoreapplication_win.cpp +++ b/src/corelib/kernel/qcoreapplication_win.cpp @@ -1022,12 +1022,12 @@ QString decodeMSG(const MSG& msg) if (!winPos) break; QString hwndAfter = valueCheck(quint64(winPos->hwndInsertAfter), - FLAG_STRING((quintptr)HWND_BOTTOM, "HWND_BOTTOM"), - FLAG_STRING((quintptr)HWND_NOTOPMOST, "HWND_NOTOPMOST"), - FLAG_STRING((quintptr)HWND_TOP, "HWND_TOP"), - FLAG_STRING((quintptr)HWND_TOPMOST, "HWND_TOPMOST"), + FLAG_STRING((qptrdiff)HWND_BOTTOM, "HWND_BOTTOM"), + FLAG_STRING((qptrdiff)HWND_NOTOPMOST, "HWND_NOTOPMOST"), + FLAG_STRING((qptrdiff)HWND_TOP, "HWND_TOP"), + FLAG_STRING((qptrdiff)HWND_TOPMOST, "HWND_TOPMOST"), FLAG_STRING()); - if (hwndAfter.size() == 0) + if (hwndAfter.isEmpty()) hwndAfter = QString::number((quintptr)winPos->hwndInsertAfter, 16); QString flags = flagCheck(winPos->flags, FLGSTR(SWP_DRAWFRAME), |