From 87274e272d2a854563066489e20d019b4e6320de Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 18 Oct 2011 09:54:31 +0200 Subject: 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 Change-Id: I488a0adadb98934567aa6416206a80465c9c3a81 Reviewed-by: Friedemann Kleint Reviewed-by: Casper van Donderen --- examples/qtconcurrent/wordcount/main.cpp | 8 -------- examples/qtconcurrent/wordcount/wordcount.pro | 2 -- 2 files changed, 10 deletions(-) (limited to 'examples/qtconcurrent/wordcount') 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) -- cgit v1.2.3