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>

19 files changed, 2 insertions, 109 deletions

diff --git a/examples/dialogs/classwizard/classwizard.pro b/examples/dialogs/classwizard/classwizard.pro
index 6dd1cac37c..d50ba675af 100644
--- a/examples/dialogs/classwizard/classwizard.pro
+++ b/examples/dialogs/classwizard/classwizard.pro
@@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/classwizard
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example might not fully work on Symbian platform)
-maemo5: warning(This example might not fully work on Maemo platform)
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/dialogs/configdialog/configdialog.pro b/examples/dialogs/configdialog/configdialog.pro
index 51a7f457d7..643c2a238f 100644
--- a/examples/dialogs/configdialog/configdialog.pro
+++ b/examples/dialogs/configdialog/configdialog.pro
@@ -11,11 +11,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/configdialog
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
 
 QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example might not fully work on Symbian platform)
-maemo5: warning(This example might not fully work on Maemo platform)
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/dialogs/dialogs.pro b/examples/dialogs/dialogs.pro
index 47444c10f1..a59e480efa 100644
--- a/examples/dialogs/dialogs.pro
+++ b/examples/dialogs/dialogs.pro
@@ -5,7 +5,7 @@ SUBDIRS       = classwizard \
                 tabdialog \
                 trivialwizard
 
-!symbian:!wince*: SUBDIRS += licensewizard \
+!wince*: SUBDIRS += licensewizard \
                     extension \
                     findfiles
 
@@ -16,6 +16,4 @@ sources.files = README *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs
 INSTALLS += sources
 
-symbian: CONFIG += qt_example
 QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/dialogs/extension/extension.pro b/examples/dialogs/extension/extension.pro
index 5511f37150..7e11dda4ab 100644
--- a/examples/dialogs/extension/extension.pro
+++ b/examples/dialogs/extension/extension.pro
@@ -8,7 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/extension
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 QT += widgets
-maemo5: CONFIG += qt_example
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/dialogs/extension/finddialog.cpp b/examples/dialogs/extension/finddialog.cpp
index 0e797edf81..6edaa06594 100644
--- a/examples/dialogs/extension/finddialog.cpp
+++ b/examples/dialogs/extension/finddialog.cpp
@@ -74,42 +74,11 @@ FindDialog::FindDialog(QWidget *parent)
 //! [2]
 
 //! [3]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
-    // Create menu
-    QMenu *menu = new QMenu(this);
-
-    // Create Find menu item
-    menu->addAction(tr("Find"));
-
-    // Create More menu item
-    QAction *moreAction = menu->addAction(tr("More"));
-    moreAction->setCheckable(true);
-
-    // Create Options CBA
-    QAction *optionAction = new QAction(tr("Options"), this);
-
-    // Set defined menu into Options button
-    optionAction->setMenu(menu);
-    optionAction->setSoftKeyRole(QAction::PositiveSoftKey);
-    addAction(optionAction);
-
-    // Connect More menu item to setVisible slot
-    connect(moreAction, SIGNAL(triggered(bool)), extension, SLOT(setVisible(bool)));
-
-    // Create Exit CBA
-    QAction *backSoftKeyAction = new QAction(QString(tr("Exit")), this);
-    backSoftKeyAction->setSoftKeyRole(QAction::NegativeSoftKey);
-
-    // Exit button closes the application
-    connect(backSoftKeyAction, SIGNAL(triggered()), qApp, SLOT(quit()));
-    addAction(backSoftKeyAction);
-#else
     buttonBox = new QDialogButtonBox(Qt::Vertical);
     buttonBox->addButton(findButton, QDialogButtonBox::ActionRole);
     buttonBox->addButton(moreButton, QDialogButtonBox::ActionRole);
 
     connect(moreButton, SIGNAL(toggled(bool)), extension, SLOT(setVisible(bool)));
-#endif
 
     QVBoxLayout *extensionLayout = new QVBoxLayout;
     extensionLayout->setMargin(0);
@@ -130,13 +99,9 @@ FindDialog::FindDialog(QWidget *parent)
     leftLayout->addWidget(fromStartCheckBox);
 
     QGridLayout *mainLayout = new QGridLayout;
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR)
     mainLayout->setSizeConstraint(QLayout::SetFixedSize);
-#endif
     mainLayout->addLayout(leftLayout, 0, 0);
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_SIMULATOR)
     mainLayout->addWidget(buttonBox, 0, 1);
-#endif
     mainLayout->addWidget(extension, 1, 0, 1, 2);
     mainLayout->setRowStretch(2, 1);
 
diff --git a/examples/dialogs/extension/main.cpp b/examples/dialogs/extension/main.cpp
index 9937b6d0b5..b54c1293d1 100644
--- a/examples/dialogs/extension/main.cpp
+++ b/examples/dialogs/extension/main.cpp
@@ -47,11 +47,7 @@ int main(int argc, char *argv[])
     QApplication app(argc, argv);
     FindDialog dialog;
 
-#ifdef Q_OS_SYMBIAN
-    dialog.showMaximized();
-#else
     dialog.show();
-#endif
 
     return app.exec();
 }
diff --git a/examples/dialogs/findfiles/findfiles.pro b/examples/dialogs/findfiles/findfiles.pro
index c19d47e271..51d1c0eed1 100644
--- a/examples/dialogs/findfiles/findfiles.pro
+++ b/examples/dialogs/findfiles/findfiles.pro
@@ -8,6 +8,4 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/findfiles
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/dialogs/findfiles/main.cpp b/examples/dialogs/findfiles/main.cpp
index c5a324a452..f2079f511b 100644
--- a/examples/dialogs/findfiles/main.cpp
+++ b/examples/dialogs/findfiles/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
 {
     QApplication app(argc, argv);
     Window window;
-#ifdef Q_OS_SYMBIAN
-    window.showMaximized();
-#else
     window.show();
-#endif
     return app.exec();
 }
diff --git a/examples/dialogs/findfiles/window.cpp b/examples/dialogs/findfiles/window.cpp
index d2ffd0988e..d0515399d4 100644
--- a/examples/dialogs/findfiles/window.cpp
+++ b/examples/dialogs/findfiles/window.cpp
@@ -77,9 +77,7 @@ Window::Window(QWidget *parent)
     setLayout(mainLayout);
 
     setWindowTitle(tr("Find Files"));
-#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR)
     resize(700, 300);
-#endif
 }
 //! [1]
 
@@ -193,11 +191,7 @@ void Window::showFiles(const QStringList &files)
         filesTable->setItem(row, 1, sizeItem);
     }
     filesFoundLabel->setText(tr("%1 file(s) found").arg(files.size()) +
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5)
-                             (" (Select file to open it)"));
-#else
                              (" (Double click on a file to open it)"));
-#endif
     filesFoundLabel->setWordWrap(true);
 }
 //! [8]
@@ -218,9 +212,6 @@ QComboBox *Window::createComboBox(const QString &text)
     comboBox->setEditable(true);
     comboBox->addItem(text);
     comboBox->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
-    comboBox->setMinimumContentsLength(3);
-#endif
     return comboBox;
 }
 //! [10]
diff --git a/examples/dialogs/licensewizard/licensewizard.cpp b/examples/dialogs/licensewizard/licensewizard.cpp
index 1c9587161b..a1599145de 100644
--- a/examples/dialogs/licensewizard/licensewizard.cpp
+++ b/examples/dialogs/licensewizard/licensewizard.cpp
@@ -60,7 +60,7 @@ LicenseWizard::LicenseWizard(QWidget *parent)
 //! [2]
 
 //! [3]
-#ifndef Q_WS_MAC
+#ifndef Q_OS_MAC
 //! [3] //! [4]
     setWizardStyle(ModernStyle);
 #endif
diff --git a/examples/dialogs/licensewizard/licensewizard.pro b/examples/dialogs/licensewizard/licensewizard.pro
index 20b533644e..c61325772e 100644
--- a/examples/dialogs/licensewizard/licensewizard.pro
+++ b/examples/dialogs/licensewizard/licensewizard.pro
@@ -9,9 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/licensewizard
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 QT += widgets printsupport
-maemo5: CONFIG += qt_example
-symbian: warning(This example might not fully work on Symbian platform)
-maemo5: warning(This example might not fully work on Maemo platform)
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/dialogs/sipdialog/sipdialog.pro b/examples/dialogs/sipdialog/sipdialog.pro
index cea038ede3..72db93f646 100644
--- a/examples/dialogs/sipdialog/sipdialog.pro
+++ b/examples/dialogs/sipdialog/sipdialog.pro
@@ -8,12 +8,8 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/sipdialog
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
 
 QT += widgets
 
-maemo5: CONFIG += qt_example
-symbian: warning(This example might not fully work on Symbian platform)
-maemo5: warning(This example might not fully work on Maemo platform)
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/dialogs/standarddialogs/dialog.cpp b/examples/dialogs/standarddialogs/dialog.cpp
index 28fdaaad80..4566da3969 100644
--- a/examples/dialogs/standarddialogs/dialog.cpp
+++ b/examples/dialogs/standarddialogs/dialog.cpp
@@ -184,19 +184,7 @@ Dialog::Dialog(QWidget *parent)
     layout->addWidget(errorButton, 14, 0);
     layout->addWidget(errorLabel, 14, 1);
     layout->addWidget(native, 15, 0);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
-    QWidget *widget = new QWidget;
-    widget->setLayout(layout);
-
-    QScrollArea *scrollArea = new QScrollArea(this);
-    scrollArea->setWidget(widget);
-
-    QHBoxLayout *mainLayout = new QHBoxLayout;
-    mainLayout->addWidget(scrollArea);
-    setLayout(mainLayout);
-#else
     setLayout(layout);
-#endif
 
     setWindowTitle(tr("Standard Dialogs"));
 }
diff --git a/examples/dialogs/standarddialogs/main.cpp b/examples/dialogs/standarddialogs/main.cpp
index 5dbf2cf910..11b6f50a0e 100644
--- a/examples/dialogs/standarddialogs/main.cpp
+++ b/examples/dialogs/standarddialogs/main.cpp
@@ -56,11 +56,7 @@ int main(int argc, char *argv[])
         app.installTranslator(translator);
 
     Dialog dialog;
-#ifdef Q_OS_SYMBIAN
-    dialog.showMaximized();
-#else
     dialog.show();
-#endif
 
     return app.exec();
 }
diff --git a/examples/dialogs/standarddialogs/standarddialogs.pro b/examples/dialogs/standarddialogs/standarddialogs.pro
index 59cd79f413..cbcb4d7302 100644
--- a/examples/dialogs/standarddialogs/standarddialogs.pro
+++ b/examples/dialogs/standarddialogs/standarddialogs.pro
@@ -8,8 +8,6 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/standarddialogs
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
 
 QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/dialogs/tabdialog/main.cpp b/examples/dialogs/tabdialog/main.cpp
index 6c83aa0b80..879b16d21e 100644
--- a/examples/dialogs/tabdialog/main.cpp
+++ b/examples/dialogs/tabdialog/main.cpp
@@ -53,11 +53,7 @@ int main(int argc, char *argv[])
         fileName = ".";
 
     TabDialog tabdialog(fileName);
-#ifdef Q_OS_SYMBIAN
-    tabdialog.showMaximized();
-#else
     tabdialog.show();
-#endif
 
     return app.exec();
 }
diff --git a/examples/dialogs/tabdialog/tabdialog.pro b/examples/dialogs/tabdialog/tabdialog.pro
index 4e01a68b96..66ac14daf2 100644
--- a/examples/dialogs/tabdialog/tabdialog.pro
+++ b/examples/dialogs/tabdialog/tabdialog.pro
@@ -8,9 +8,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/tabdialog
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib
 QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example might not fully work on Symbian platform)
-maemo5: warning(This example might not fully work on Maemo platform)
diff --git a/examples/dialogs/trivialwizard/trivialwizard.cpp b/examples/dialogs/trivialwizard/trivialwizard.cpp
index df7d4e6559..5e3ef97694 100644
--- a/examples/dialogs/trivialwizard/trivialwizard.cpp
+++ b/examples/dialogs/trivialwizard/trivialwizard.cpp
@@ -128,11 +128,7 @@ int main(int argc, char *argv[])
     wizard.addPage(createConclusionPage());
 
     wizard.setWindowTitle("Trivial Wizard");
-#ifdef Q_OS_SYMBIAN
-    wizard.showMaximized();
-#else
     wizard.show();
-#endif
 
     return app.exec();
 }
diff --git a/examples/dialogs/trivialwizard/trivialwizard.pro b/examples/dialogs/trivialwizard/trivialwizard.pro
index b2a285e95a..26d488d99d 100644
--- a/examples/dialogs/trivialwizard/trivialwizard.pro
+++ b/examples/dialogs/trivialwizard/trivialwizard.pro
@@ -6,8 +6,5 @@ sources.files = $$SOURCES $$HEADERS *.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/dialogs/trivialwizard
 INSTALLS += target sources
 
-symbian: CONFIG += qt_example
 QT += widgets
-maemo5: CONFIG += qt_example
-symbian: warning(This example might not fully work on Symbian platform)
 simulator: warning(This example might not fully work on Simulator platform)