diff options
| author | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-03 13:50:27 (GMT) |
|---|---|---|
| committer | Gunnar Sletta <gunnar@trolltech.com> | 2009-09-03 13:50:27 (GMT) |
| commit | 245c63c306be18442ee9fd1178e30bfb4aad7717 (patch) | |
| tree | 14a5ab9a8961db37a199491dce4ecc44f67b1e5c | |
| parent | 0f5a01f0e45e5bd91bb4b8b2989192060e035f1a (diff) | |
| parent | 9ac8b0d3215e25a45d2119dbfe3c02770c29e923 (diff) | |
| download | Qt-245c63c306be18442ee9fd1178e30bfb4aad7717.zip Qt-245c63c306be18442ee9fd1178e30bfb4aad7717.tar.gz Qt-245c63c306be18442ee9fd1178e30bfb4aad7717.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
| -rw-r--r-- | demos/boxes/scene.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 11 | ||||
| -rw-r--r-- | tests/auto/qimagereader/tst_qimagereader.cpp | 2 |
3 files changed, 10 insertions, 5 deletions
diff --git a/demos/boxes/scene.h b/demos/boxes/scene.h index efe1e3f..23f17e5 100644 --- a/demos/boxes/scene.h +++ b/demos/boxes/scene.h @@ -108,6 +108,8 @@ private: class GraphicsWidget : public QGraphicsProxyWidget { +public: + GraphicsWidget() : QGraphicsProxyWidget(0, Qt::Window) {} protected: virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); virtual void resizeEvent(QGraphicsSceneResizeEvent *event); diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index d23494e..84edf1f 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -2026,13 +2026,16 @@ LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam // WM_ACTIVATEAPP handles the "true" false case, as this is only when the application // loses focus. Doing it here would result in the widget getting focus to not know // where it got it from; it would simply get a 0 value as the old focus widget. -#ifndef Q_WS_WINCE_WM - if (!(widget->windowState() & Qt::WindowMinimized)) { - // Ignore the activate message send by WindowsXP to a minimized window -#else +#ifdef Q_WS_WINCE { if (widget->windowState() & Qt::WindowMinimized) widget->dataPtr()->window_state &= ~Qt::WindowMinimized; +#else + if (!(widget->windowState() & Qt::WindowMinimized)) { +#endif + // Ignore the activate message send by WindowsXP to a minimized window +#ifdef Q_WS_WINCE_WM + { if (widget->windowState() & Qt::WindowFullScreen) qt_wince_hide_taskbar(widget->winId()); #endif diff --git a/tests/auto/qimagereader/tst_qimagereader.cpp b/tests/auto/qimagereader/tst_qimagereader.cpp index a325a33..65ca6e8 100644 --- a/tests/auto/qimagereader/tst_qimagereader.cpp +++ b/tests/auto/qimagereader/tst_qimagereader.cpp @@ -1249,7 +1249,7 @@ void tst_QImageReader::readCorruptImage() void tst_QImageReader::readCorruptBmp() { - QCOMPARE(QImage("tst7.bmp").convertToFormat(QImage::Format_ARGB32_Premultiplied), QImage("images/tst7.png").convertToFormat(QImage::Format_ARGB32_Premultiplied)); + QCOMPARE(QImage(prefix + "tst7.bmp").convertToFormat(QImage::Format_ARGB32_Premultiplied), QImage(prefix + "tst7.png").convertToFormat(QImage::Format_ARGB32_Premultiplied)); } void tst_QImageReader::supportsOption_data() |