From 2ae17a14052f29d7e5e14a957d9b2c9fbc7cdf5f Mon Sep 17 00:00:00 2001
From: Kim Motoyoshi Kalland <kim.kalland@nokia.com>
Date: Thu, 3 Sep 2009 14:55:42 +0200
Subject: Fixed incorrect file path in qimagereader autotest.

Reviewed-by: Benjamin Poulain
---
 tests/auto/qimagereader/tst_qimagereader.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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()
-- 
cgit v0.12


From 2669c6114062156b9fb77141afd0431c628d8599 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@nokia.com>
Date: Thu, 3 Sep 2009 15:14:57 +0200
Subject: restoring a minimized window on Windows CE didn't work

After restoring a minimized window we only saw the window decoration.
All content was missing. That's because we don't get a WM_SIZE message
for restoring the window. We must react on WM_ACTIVATE in this case.

Task-number: 260702
Reviewed-by: thartman
---
 src/gui/kernel/qapplication_win.cpp | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index ddc491b..b631dd5 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -2082,7 +2082,13 @@ 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.
+#ifdef Q_OS_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_OS_WINCE_WM
                     if  (widget->windowState() & Qt::WindowFullScreen)
-- 
cgit v0.12


From 9ac8b0d3215e25a45d2119dbfe3c02770c29e923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan-Arve=20S=C3=A6ther?= <jan-arve.saether@nokia.com>
Date: Thu, 3 Sep 2009 15:39:44 +0200
Subject: Make sure that the dialog in the boxes demo paints window
 decorations.

tst_QGraphicsProxyWidget::windowFlags() demonstrates that this is
intended behaviour.

Reviewed-by: Kim
---
 demos/boxes/scene.h | 2 ++
 1 file changed, 2 insertions(+)

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);
-- 
cgit v0.12