12 files changed, 32 insertions, 35 deletions
diff --git a/examples/scroller/graphicsview/main.cpp b/examples/scroller/graphicsview/main.cpp
index 9714423..6378f91 100644
--- a/examples/scroller/graphicsview/main.cpp
+++ b/examples/scroller/graphicsview/main.cpp
@@ -279,14 +279,18 @@ protected:
 
 int main(int argc, char *argv[])
 {
-    QApplication app(argc, argv);
-    bool useTouch = (app.arguments().contains(QLatin1String("--touch")));
-    MainWindow mw(useTouch);
+    QApplication a(argc, argv);
+    bool touch = (a.arguments().contains(QLatin1String("--touch")));
+    MainWindow mw(touch);
+#ifdef Q_WS_S60
+    mw.showMaximized();
+#else
     mw.show();
+#endif
 #ifdef Q_WS_MAC
     mw.raise();
 #endif
-    return app.exec();
+    return a.exec();
 }
 
 #include "main.moc"
diff --git a/examples/scroller/plot/main.cpp b/examples/scroller/plot/main.cpp
index 944ddb7..a98abfc 100644
--- a/examples/scroller/plot/main.cpp
+++ b/examples/scroller/plot/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -208,15 +208,14 @@ int main(int argc, char **argv)
     if (a.arguments().contains(QLatin1String("--touch")))
         touch = true;
 
-    MainWindow *mw = new MainWindow(smallscreen, touch);
+    MainWindow mw(smallscreen, touch);
     if (smallscreen)
-        mw->showMaximized();
+        mw.showMaximized();
     else
-        mw->show();
+        mw.show();
 #if defined(Q_WS_MAC)
-    mw->raise();
+    mw.raise();
 #endif
-
     return a.exec();
 }
 
diff --git a/examples/scroller/plot/plot.pro b/examples/scroller/plot/plot.pro
index 8c37b04..04fdf70 100644
--- a/examples/scroller/plot/plot.pro
+++ b/examples/scroller/plot/plot.pro
@@ -11,8 +11,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/scroller/plot
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plot.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/scroller/plot
 INSTALLS += target sources
-
-symbian {
-    TARGET.UID3 = 0xA000CF66
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-}
diff --git a/examples/scroller/plot/plotwidget.cpp b/examples/scroller/plot/plotwidget.cpp
index f639097..c47f107 100644
--- a/examples/scroller/plot/plotwidget.cpp
+++ b/examples/scroller/plot/plotwidget.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/examples/scroller/plot/plotwidget.h b/examples/scroller/plot/plotwidget.h
index 3cfe576..dc886d8 100644
--- a/examples/scroller/plot/plotwidget.h
+++ b/examples/scroller/plot/plotwidget.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/examples/scroller/plot/settingswidget.cpp b/examples/scroller/plot/settingswidget.cpp
index e52d27d..792d8d0 100644
--- a/examples/scroller/plot/settingswidget.cpp
+++ b/examples/scroller/plot/settingswidget.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/examples/scroller/plot/settingswidget.h b/examples/scroller/plot/settingswidget.h
index 0dd9943..e0ffb4a 100644
--- a/examples/scroller/plot/settingswidget.h
+++ b/examples/scroller/plot/settingswidget.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/examples/scroller/scroller.pro b/examples/scroller/scroller.pro
index e830745..9a9991a 100644
--- a/examples/scroller/scroller.pro
+++ b/examples/scroller/scroller.pro
@@ -1,7 +1,7 @@
 TEMPLATE      = subdirs
-SUBDIRS       = graphicsview \
-                plot \
-                wheel
+SUBDIRS       = graphicsview
+
+contains(QT_CONFIG, webkit):SUBDIRS += plot wheel
 
 # install
 sources.files = *.pro
diff --git a/examples/scroller/wheel/main.cpp b/examples/scroller/wheel/main.cpp
index 12cee72..22bae5c 100644
--- a/examples/scroller/wheel/main.cpp
+++ b/examples/scroller/wheel/main.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
@@ -107,12 +107,16 @@ private:
 int main(int argc, char **argv)
 {
     QApplication a(argc, argv);
-
     bool touch = a.arguments().contains(QLatin1String("--touch"));
-
-    MainWindow *mw = new MainWindow(touch);
-    mw->show();
-
+    MainWindow mw(touch);
+#ifdef Q_WS_S60
+    mw.showMaximized();
+#else
+    mw.show();
+#endif
+#ifdef Q_WS_MAC
+    mw.raise();
+#endif
     return a.exec();
 }
 
diff --git a/examples/scroller/wheel/wheel.pro b/examples/scroller/wheel/wheel.pro
index 1f9b789..48fe171 100644
--- a/examples/scroller/wheel/wheel.pro
+++ b/examples/scroller/wheel/wheel.pro
@@ -9,8 +9,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/scroller/wheel
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wheel.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/scroller/wheel
 INSTALLS += target sources
-
-symbian {
-    TARGET.UID3 = 0xA000CF66
-    include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri)
-}
diff --git a/examples/scroller/wheel/wheelwidget.cpp b/examples/scroller/wheel/wheelwidget.cpp
index 1b9d7b7..54daca3 100644
--- a/examples/scroller/wheel/wheelwidget.cpp
+++ b/examples/scroller/wheel/wheelwidget.cpp
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage
diff --git a/examples/scroller/wheel/wheelwidget.h b/examples/scroller/wheel/wheelwidget.h
index 573cb7a..1e41c02 100644
--- a/examples/scroller/wheel/wheelwidget.h
+++ b/examples/scroller/wheel/wheelwidget.h
@@ -4,7 +4,7 @@
 ** All rights reserved.
 ** Contact: Nokia Corporation (qt-info@nokia.com)
 **
-** This file is part of the QtGui module of the Qt Toolkit.
+** This file is part of the examples of the Qt Toolkit.
 **
 ** $QT_BEGIN_LICENSE:LGPL$
 ** No Commercial Usage