From 0748751c9f097d9d866605306bbdd4b96e2a5c4e Mon Sep 17 00:00:00 2001
From: David Boddie <david.boddie@nokia.com>
Date: Wed, 27 Apr 2011 19:16:41 +0200
Subject: Squashed commit of the changes from the mobile-examples repository
 (4.7-generated-declarative branch).

---
 examples/qtconcurrent/runfunction/main.cpp        | 19 +++++++++++++++++--
 examples/qtconcurrent/runfunction/runfunction.pro |  4 +++-
 2 files changed, 20 insertions(+), 3 deletions(-)

(limited to 'examples/qtconcurrent/runfunction')

diff --git a/examples/qtconcurrent/runfunction/main.cpp b/examples/qtconcurrent/runfunction/main.cpp
index 1e448bb71d..86fdf80aa4 100644
--- a/examples/qtconcurrent/runfunction/main.cpp
+++ b/examples/qtconcurrent/runfunction/main.cpp
@@ -64,9 +64,24 @@ int main(int argc, char **argv)
 
 #else
 
-int main()
+#include <QLabel>
+
+int main(int argc, char *argv[])
 {
-	qDebug() << "Qt Concurrent is not yet supported on this platform";
+    QApplication app(argc, argv);
+    QString text("Qt Concurrent is not yet 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
diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro
index f5b359c5ef..ae87ffe839 100644
--- a/examples/qtconcurrent/runfunction/runfunction.pro
+++ b/examples/qtconcurrent/runfunction/runfunction.pro
@@ -1,5 +1,4 @@
 TEMPLATE = app
-TARGET += 
 DEPENDPATH += .
 INCLUDEPATH += .
 
@@ -14,3 +13,6 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction
 INSTALLS += target sources
 
 symbian: CONFIG += qt_example
+maemo5: CONFIG += qt_example
+
+simulator: warning(This example does not work on Simulator platform)
-- 
cgit v1.2.3