diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-24 18:08:20 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-03-24 18:08:20 (GMT) |
| commit | 10ecfc2a444263a2fbaf2ebbf401eac62b6ff70b (patch) | |
| tree | bb19a6cdfc60d767978b711e7160bf4dc347cc60 /src/gui/kernel/qapplication_win.cpp | |
| parent | d44a204988320c7c1a990536565fcb655d34db1e (diff) | |
| parent | e15d5fc7e1a82da38b765e55d040edbdf8621ae2 (diff) | |
| download | Qt-10ecfc2a444263a2fbaf2ebbf401eac62b6ff70b.zip Qt-10ecfc2a444263a2fbaf2ebbf401eac62b6ff70b.tar.gz Qt-10ecfc2a444263a2fbaf2ebbf401eac62b6ff70b.tar.bz2 | |
Merge remote branch 'origin/4.7' into HEAD
Four-way merge: take the qt-qml.git#4.7 branch version (which uses
fromUtf8). I used QLatin1String, Thierry used QString::fromLatin1.
Conflicts:
src/declarative/qml/qdeclarativecompiler.cpp
Diffstat (limited to 'src/gui/kernel/qapplication_win.cpp')
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 1a649ea..1d8eb4c 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -2282,7 +2282,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa case WM_GETOBJECT: { // Ignoring all requests while starting up - if (QApplication::startingUp() || QApplication::closingDown() || (DWORD)lParam != OBJID_CLIENT) { + if (QApplication::startingUp() || QApplication::closingDown() || (LONG)lParam != OBJID_CLIENT) { result = false; break; } |