diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 05:21:19 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-03 05:21:19 (GMT) |
| commit | 7424f955adc988e79f9158b3683116259a3da0b3 (patch) | |
| tree | 8a85b5afa3bf3f0f05dcb73b0ffad9b0a2ac26e6 | |
| parent | 766fedb9b7793cbd4364de1f1a717608d8c58164 (diff) | |
| parent | a74b236e732a9326eb27fcbaac5e1ee2fcd07198 (diff) | |
| download | Qt-7424f955adc988e79f9158b3683116259a3da0b3.zip Qt-7424f955adc988e79f9158b3683116259a3da0b3.tar.gz Qt-7424f955adc988e79f9158b3683116259a3da0b3.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
Windows CE: missing null check added in 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 6c30a4a..b3fc2f6 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -1527,7 +1527,7 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam case WM_SETTINGCHANGE: #ifdef Q_WS_WINCE // CE SIP hide/show - if (wParam == SPI_SETSIPINFO) { + if (qt_desktopWidget && wParam == SPI_SETSIPINFO) { QResizeEvent re(QSize(0, 0), QSize(0, 0)); // Calculated by QDesktopWidget QApplication::sendEvent(qt_desktopWidget, &re); break; |