Squashed commit of the changes from the mobile-examples repository

(4.7-generated-declarative branch).

2 files changed, 22 insertions, 2 deletions

diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro
index f6c029b678..cb87d718f5 100644
--- a/examples/qtconcurrent/imagescaling/imagescaling.pro
+++ b/examples/qtconcurrent/imagescaling/imagescaling.pro
@@ -15,3 +15,6 @@ INSTALLS += target sources
 symbian: CONFIG += qt_example
 
 wince*: DEPLOYMENT_PLUGIN += qgif qjpeg qtiff
+maemo5: include($$QT_SOURCE_TREE/examples/maemo5pkgrules.pri)
+
+simulator: warning(This example does not work on Simulator platform)
diff --git a/examples/qtconcurrent/imagescaling/main.cpp b/examples/qtconcurrent/imagescaling/main.cpp
index de64116f1c..d6ca7e57f0 100644
--- a/examples/qtconcurrent/imagescaling/main.cpp
+++ b/examples/qtconcurrent/imagescaling/main.cpp
@@ -48,16 +48,33 @@ int main(int argc, char *argv[])
     QApplication app(argc,argv);
 
     Images imageView;
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+    imageView.showMaximized();
+#else
     imageView.show();
+#endif
 
     return app.exec();
 }
 
 #else
 
-int main()
+int main(int argc, char *argv[])
 {
-    qDebug() << "Qt Concurrent is not supported on this platform";
+    QApplication app(argc, argv);
+    QString text("Qt Concurrent is not supported on this platform");
+
+    QLabel *label = new QLabel(text);
+    label->setWordWrap(true);
+
+#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
+    label->showMaximized();
+#else
+    label->show();
+#endif
+    qDebug() << text;
+
+    app.exec();
 }
 
 #endif