Merge branch 'master' of git@scm.dev.troll.no:qt/qt-s60-public

Conflicts:
	configure.exe

2 files changed, 7 insertions, 8 deletions

diff --git a/examples/dialogs/sipdialog/dialog.cpp b/examples/dialogs/sipdialog/dialog.cpp
index 9f1b9ad..653b518 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 5fcbfd8..fec6de2 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]