Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

Conflicts:
	configure.exe
	examples/itemviews/puzzle/puzzle.pro
	examples/qtconcurrent/imagescaling/imagescaling.pro
	examples/widgets/movie/movie.pro
	tools/configure/configureapp.cpp

Will rebuild configure.exe in next commit.

8 files changed, 31 insertions, 11 deletions

diff --git a/examples/dialogs/sipdialog/dialog.cpp b/examples/dialogs/sipdialog/dialog.cpp
index 9f1b9adc22..653b518f55 100644
--- a/examples/dialogs/sipdialog/dialog.cpp
+++ b/examples/dialogs/sipdialog/dialog.cpp
@@ -90,7 +90,7 @@ Dialog::Dialog()
 //! [Dialog constructor part4]
 
 //! [Dialog constructor part5]
-    connect(button, SIGNAL(pressed()), 
+    connect(button, SIGNAL(clicked()),
         qApp, SLOT(closeAllWindows()));
     connect(QApplication::desktop(), SIGNAL(workAreaResized(int)), 
         this, SLOT(desktopResized(int)));
@@ -111,14 +111,13 @@ void Dialog::reactToSIP()
 {
     QRect availableGeometry = QApplication::desktop()->availableGeometry(0);
 
-    if (desktopGeometry.width() == availableGeometry.width()) {
-        if (desktopGeometry.height() > availableGeometry.height()) {
+    if (desktopGeometry != availableGeometry) {
+        if (windowState() | Qt::WindowMaximized)
             setWindowState(windowState() & ~Qt::WindowMaximized);
-            setGeometry(availableGeometry);
-        } else {
-            setWindowState(windowState() | Qt::WindowMaximized);
-        }
+
+        setGeometry(availableGeometry);
     }
+
     desktopGeometry = availableGeometry;
 }
 //! [reactToSIP() function]
diff --git a/examples/dialogs/sipdialog/main.cpp b/examples/dialogs/sipdialog/main.cpp
index 5fcbfd806e..fec6de2d5a 100644
--- a/examples/dialogs/sipdialog/main.cpp
+++ b/examples/dialogs/sipdialog/main.cpp
@@ -48,6 +48,6 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     Dialog dialog;
-    dialog.exec();
+    return dialog.exec();
 }
 //! [main() function]
diff --git a/examples/itemviews/puzzle/puzzle.pro b/examples/itemviews/puzzle/puzzle.pro
index e5ee3dd84f..de17a69957 100644
--- a/examples/itemviews/puzzle/puzzle.pro
+++ b/examples/itemviews/puzzle/puzzle.pro
@@ -14,3 +14,8 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/itemviews/puzzle
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+wince* {
+   DEPLOYMENT_PLUGIN += qjpeg qgif qtiff
+}
+
diff --git a/examples/network/googlesuggest/googlesuggest.pro b/examples/network/googlesuggest/googlesuggest.pro
index afd600f85f..33b79de5e4 100644
--- a/examples/network/googlesuggest/googlesuggest.pro
+++ b/examples/network/googlesuggest/googlesuggest.pro
@@ -3,7 +3,7 @@ SOURCES =   main.cpp searchbox.cpp googlesuggest.cpp
 HEADERS  =  searchbox.h googlesuggest.h
 
 # install
-target.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlesuggest
+target.path = $$[QT_INSTALL_EXAMPLES]/network/googlesuggest
 sources.files = $$SOURCES $$HEADERS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/webkit/googlesuggest
+sources.path = $$[QT_INSTALL_EXAMPLES]/network/googlesuggest
 INSTALLS += target sources
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro
index 2040e7c5cf..180571ca91 100644
--- a/examples/qtconcurrent/imagescaling/imagescaling.pro
+++ b/examples/qtconcurrent/imagescaling/imagescaling.pro
@@ -13,3 +13,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+wince*: DEPLOYMENT_PLUGIN += qgif qjpeg qtiff
diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro
index b21cb17c45..a30c0bd536 100644
--- a/examples/qtconcurrent/qtconcurrent.pro
+++ b/examples/qtconcurrent/qtconcurrent.pro
@@ -1,10 +1,13 @@
 TEMPLATE      = subdirs
 SUBDIRS       = imagescaling \
                 map \
-                progressdialog \
                 runfunction \
                 wordcount
 
+!wince* {
+    SUBDIRS += progressdialog
+}
+
 # install
 target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README
diff --git a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro
index 1881fce1fd..c216a30b14 100644
--- a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro
+++ b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro
@@ -8,3 +8,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper
 sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper
 INSTALLS += target sources
+
+wince*: DEPLOYMENT_PLUGIN += qsqlite
+
diff --git a/examples/widgets/movie/movie.pro b/examples/widgets/movie/movie.pro
index f5c94d38d1..fe011d2d09 100644
--- a/examples/widgets/movie/movie.pro
+++ b/examples/widgets/movie/movie.pro
@@ -9,3 +9,11 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/movie
 INSTALLS += target sources
 
 include($$QT_SOURCE_TREE/examples/examplebase.pri)
+
+wince*: {
+   addFiles.sources += *.mng
+   addFiles.path = .
+   DEPLOYMENT += addFiles
+   DEPLOYMENT_PLUGIN += qmng
+}
+