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/layouts | |
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/layouts')
-rw-r--r-- | examples/layouts/basiclayouts/basiclayouts.pro | 4 | ||||
-rw-r--r-- | examples/layouts/basiclayouts/main.cpp | 4 | ||||
-rw-r--r-- | examples/layouts/borderlayout/borderlayout.pro | 2 | ||||
-rw-r--r-- | examples/layouts/borderlayout/main.cpp | 4 | ||||
-rw-r--r-- | examples/layouts/dynamiclayouts/dialog.cpp | 4 | ||||
-rw-r--r-- | examples/layouts/dynamiclayouts/dialog.h | 4 | ||||
-rw-r--r-- | examples/layouts/dynamiclayouts/dynamiclayouts.pro | 4 | ||||
-rw-r--r-- | examples/layouts/dynamiclayouts/main.cpp | 4 | ||||
-rw-r--r-- | examples/layouts/flowlayout/flowlayout.pro | 2 | ||||
-rw-r--r-- | examples/layouts/flowlayout/main.cpp | 4 | ||||
-rw-r--r-- | examples/layouts/layouts.pro | 2 |
11 files changed, 0 insertions, 38 deletions
diff --git a/examples/layouts/basiclayouts/basiclayouts.pro b/examples/layouts/basiclayouts/basiclayouts.pro index 7751e139e7..b2c4ad896f 100644 --- a/examples/layouts/basiclayouts/basiclayouts.pro +++ b/examples/layouts/basiclayouts/basiclayouts.pro @@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/basiclayouts 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/layouts/basiclayouts/main.cpp b/examples/layouts/basiclayouts/main.cpp index 6b6077546f..767cf0f168 100644 --- a/examples/layouts/basiclayouts/main.cpp +++ b/examples/layouts/basiclayouts/main.cpp @@ -46,11 +46,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Dialog dialog; -#if defined(Q_OS_SYMBIAN) - dialog.showMaximized(); -#else dialog.show(); -#endif return app.exec(); } diff --git a/examples/layouts/borderlayout/borderlayout.pro b/examples/layouts/borderlayout/borderlayout.pro index 76a939daa4..6727af60d7 100644 --- a/examples/layouts/borderlayout/borderlayout.pro +++ b/examples/layouts/borderlayout/borderlayout.pro @@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/borderlayout INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/layouts/borderlayout/main.cpp b/examples/layouts/borderlayout/main.cpp index 4a43828d45..f2079f511b 100644 --- a/examples/layouts/borderlayout/main.cpp +++ b/examples/layouts/borderlayout/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Window window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/layouts/dynamiclayouts/dialog.cpp b/examples/layouts/dynamiclayouts/dialog.cpp index d07903d8aa..6e4f1efebc 100644 --- a/examples/layouts/dynamiclayouts/dialog.cpp +++ b/examples/layouts/dynamiclayouts/dialog.cpp @@ -43,11 +43,7 @@ #include "dialog.h" Dialog::Dialog(QWidget *parent) -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - : QWidget(parent) -#else : QDialog(parent) -#endif { createRotableGroupBox(); createOptionsGroupBox(); diff --git a/examples/layouts/dynamiclayouts/dialog.h b/examples/layouts/dynamiclayouts/dialog.h index 3ada992858..f40d160363 100644 --- a/examples/layouts/dynamiclayouts/dialog.h +++ b/examples/layouts/dynamiclayouts/dialog.h @@ -54,11 +54,7 @@ class QLabel; class QPushButton; QT_END_NAMESPACE -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) -class Dialog : public QWidget -#else class Dialog : public QDialog -#endif { Q_OBJECT diff --git a/examples/layouts/dynamiclayouts/dynamiclayouts.pro b/examples/layouts/dynamiclayouts/dynamiclayouts.pro index f6ab7791aa..3cc4c084a5 100644 --- a/examples/layouts/dynamiclayouts/dynamiclayouts.pro +++ b/examples/layouts/dynamiclayouts/dynamiclayouts.pro @@ -8,10 +8,6 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/dynamiclayouts 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/layouts/dynamiclayouts/main.cpp b/examples/layouts/dynamiclayouts/main.cpp index c30db12bb5..03ac9ad84c 100644 --- a/examples/layouts/dynamiclayouts/main.cpp +++ b/examples/layouts/dynamiclayouts/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Dialog dialog; -#if defined(Q_OS_SYMBIAN) - dialog.showMaximized(); -#else dialog.show(); -#endif return app.exec(); } diff --git a/examples/layouts/flowlayout/flowlayout.pro b/examples/layouts/flowlayout/flowlayout.pro index f59c4bc835..4ac0a43c26 100644 --- a/examples/layouts/flowlayout/flowlayout.pro +++ b/examples/layouts/flowlayout/flowlayout.pro @@ -10,6 +10,4 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts/flowlayout INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/layouts/flowlayout/main.cpp b/examples/layouts/flowlayout/main.cpp index 4a43828d45..f2079f511b 100644 --- a/examples/layouts/flowlayout/main.cpp +++ b/examples/layouts/flowlayout/main.cpp @@ -46,10 +46,6 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); Window window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/layouts/layouts.pro b/examples/layouts/layouts.pro index f1940c1421..8299052d4f 100644 --- a/examples/layouts/layouts.pro +++ b/examples/layouts/layouts.pro @@ -9,6 +9,4 @@ sources.files = README *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/layouts INSTALLS += sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example |