diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-10-18 09:54:31 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-18 15:47:49 +0200 |
commit | 87274e272d2a854563066489e20d019b4e6320de (patch) | |
tree | d01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/qtconcurrent | |
parent | 08e24858607d1b1483fb1faa54effa957501cfbb (diff) |
QtBase examples: Remove Maemo/Symbian-specific code.
- Maemo/Symbian are no longer supported and QWidget-based examples
are no longer supposed to run on mobile platforms, so, remove any
Maemo/Symbian or mobile-specific code from source files and
profiles.
- Remove Maemo/Symbian vibration examples.
- Change Q_WS_MAC/WIN to Q_OS_MAC/WIN where appropriate.
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
Diffstat (limited to 'examples/qtconcurrent')
-rw-r--r-- | examples/qtconcurrent/imagescaling/imagescaling.pro | 2 | ||||
-rw-r--r-- | examples/qtconcurrent/imagescaling/main.cpp | 8 | ||||
-rw-r--r-- | examples/qtconcurrent/map/main.cpp | 4 | ||||
-rw-r--r-- | examples/qtconcurrent/map/map.pro | 2 | ||||
-rw-r--r-- | examples/qtconcurrent/progressdialog/main.cpp | 4 | ||||
-rw-r--r-- | examples/qtconcurrent/progressdialog/progressdialog.pro | 2 | ||||
-rw-r--r-- | examples/qtconcurrent/qtconcurrent.pro | 2 | ||||
-rw-r--r-- | examples/qtconcurrent/runfunction/main.cpp | 4 | ||||
-rw-r--r-- | examples/qtconcurrent/runfunction/runfunction.pro | 2 | ||||
-rw-r--r-- | examples/qtconcurrent/wordcount/main.cpp | 8 | ||||
-rw-r--r-- | examples/qtconcurrent/wordcount/wordcount.pro | 2 |
11 files changed, 0 insertions, 40 deletions
diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro index cb931c7bfb..c5cf5c96d7 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.pro +++ b/examples/qtconcurrent/imagescaling/imagescaling.pro @@ -12,10 +12,8 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/imagescaling INSTALLS += target sources -symbian: CONFIG += qt_example wince*: DEPLOYMENT_PLUGIN += qgif qjpeg qtiff QT += widgets -maemo5: CONFIG += qt_example 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 963422fcb7..bca840810a 100644 --- a/examples/qtconcurrent/imagescaling/main.cpp +++ b/examples/qtconcurrent/imagescaling/main.cpp @@ -48,11 +48,7 @@ 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(); } @@ -67,11 +63,7 @@ int main(int argc, char *argv[]) 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(); diff --git a/examples/qtconcurrent/map/main.cpp b/examples/qtconcurrent/map/main.cpp index 76b14476f3..a3618b4e59 100644 --- a/examples/qtconcurrent/map/main.cpp +++ b/examples/qtconcurrent/map/main.cpp @@ -83,11 +83,7 @@ int main(int argc, char *argv[]) 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(); diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro index b5976d6273..978eae44b9 100644 --- a/examples/qtconcurrent/map/map.pro +++ b/examples/qtconcurrent/map/map.pro @@ -13,8 +13,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/map INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/progressdialog/main.cpp b/examples/qtconcurrent/progressdialog/main.cpp index 8473d05716..956d059911 100644 --- a/examples/qtconcurrent/progressdialog/main.cpp +++ b/examples/qtconcurrent/progressdialog/main.cpp @@ -98,11 +98,7 @@ int main(int argc, char *argv[]) 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(); diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro index 506a572aa3..fbc239d199 100644 --- a/examples/qtconcurrent/progressdialog/progressdialog.pro +++ b/examples/qtconcurrent/progressdialog/progressdialog.pro @@ -12,8 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/progressdialog INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro index a1594a26a9..e4a366d9bb 100644 --- a/examples/qtconcurrent/qtconcurrent.pro +++ b/examples/qtconcurrent/qtconcurrent.pro @@ -14,6 +14,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/qtconcurrent/runfunction/main.cpp b/examples/qtconcurrent/runfunction/main.cpp index 86fdf80aa4..f369ee8417 100644 --- a/examples/qtconcurrent/runfunction/main.cpp +++ b/examples/qtconcurrent/runfunction/main.cpp @@ -74,11 +74,7 @@ int main(int argc, char *argv[]) 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(); diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro index 80495e1db2..d41b88e2b0 100644 --- a/examples/qtconcurrent/runfunction/runfunction.pro +++ b/examples/qtconcurrent/runfunction/runfunction.pro @@ -12,8 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/runfunction INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/wordcount/main.cpp b/examples/qtconcurrent/wordcount/main.cpp index 56be795c60..25ded55f50 100644 --- a/examples/qtconcurrent/wordcount/main.cpp +++ b/examples/qtconcurrent/wordcount/main.cpp @@ -124,11 +124,7 @@ int main(int argc, char** argv) { QApplication app(argc, argv); qDebug() << "finding files..."; -#ifdef Q_WS_MAEMO_5 - QStringList files = findFiles("/usr/", QStringList() << "*.sh"); -#else QStringList files = findFiles("../../", QStringList() << "*.cpp" << "*.h"); -#endif qDebug() << files.count() << "files"; qDebug() << "warmup"; @@ -172,11 +168,7 @@ int main(int argc, char *argv[]) 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(); diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro index 2980792da1..ee4887c0f1 100644 --- a/examples/qtconcurrent/wordcount/wordcount.pro +++ b/examples/qtconcurrent/wordcount/wordcount.pro @@ -12,8 +12,6 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/qtconcurrent/wordcount INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example simulator: warning(This example does not work on Simulator platform) |