diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-24 18:13:39 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-24 18:13:39 (GMT) |
| commit | 3039c483cd2c402457e7f9cbc672ec9254d09c57 (patch) | |
| tree | 117077c4c4ab669d1db57ae89f7afbbb76a27bdb /src/corelib | |
| parent | 5ddcc726a623fea3534f76c07b6c1d2835a0e2d6 (diff) | |
| parent | e15d5fc7e1a82da38b765e55d040edbdf8621ae2 (diff) | |
| download | Qt-3039c483cd2c402457e7f9cbc672ec9254d09c57.zip Qt-3039c483cd2c402457e7f9cbc672ec9254d09c57.tar.gz Qt-3039c483cd2c402457e7f9cbc672ec9254d09c57.tar.bz2 | |
Merge remote branch 'origin/4.7' into HEAD
Conflicts:
src/declarative/qml/qdeclarativecompiler.cpp
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/io/qwindowspipewriter.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreapplication_win.cpp | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/corelib/io/qwindowspipewriter.cpp b/src/corelib/io/qwindowspipewriter.cpp index 394323f..eb42c20 100644 --- a/src/corelib/io/qwindowspipewriter.cpp +++ b/src/corelib/io/qwindowspipewriter.cpp @@ -100,7 +100,7 @@ qint64 QWindowsPipeWriter::write(const char *ptr, qint64 maxlen) void QWindowsPipeWriter::run() { - OVERLAPPED overl = {0, 0, 0, 0, NULL}; + OVERLAPPED overl = {0, 0, {{ 0 }}, 0}; overl.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL); forever { lock.lock(); 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), |