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/statemachine | |
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/statemachine')
-rw-r--r-- | examples/statemachine/eventtransitions/eventtransitions.pro | 2 | ||||
-rw-r--r-- | examples/statemachine/eventtransitions/main.cpp | 4 | ||||
-rw-r--r-- | examples/statemachine/factorial/factorial.pro | 3 | ||||
-rw-r--r-- | examples/statemachine/pingpong/pingpong.pro | 3 | ||||
-rw-r--r-- | examples/statemachine/rogue/main.cpp | 4 | ||||
-rw-r--r-- | examples/statemachine/rogue/rogue.pro | 2 | ||||
-rw-r--r-- | examples/statemachine/rogue/window.cpp | 4 | ||||
-rw-r--r-- | examples/statemachine/rogue/window.h | 5 | ||||
-rw-r--r-- | examples/statemachine/trafficlight/main.cpp | 9 | ||||
-rw-r--r-- | examples/statemachine/trafficlight/trafficlight.pro | 2 | ||||
-rw-r--r-- | examples/statemachine/twowaybutton/main.cpp | 6 | ||||
-rw-r--r-- | examples/statemachine/twowaybutton/twowaybutton.pro | 2 |
12 files changed, 0 insertions, 46 deletions
diff --git a/examples/statemachine/eventtransitions/eventtransitions.pro b/examples/statemachine/eventtransitions/eventtransitions.pro index 374ef3a72f..8a9d84e646 100644 --- a/examples/statemachine/eventtransitions/eventtransitions.pro +++ b/examples/statemachine/eventtransitions/eventtransitions.pro @@ -7,7 +7,5 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/eventtransitions INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/statemachine/eventtransitions/main.cpp b/examples/statemachine/eventtransitions/main.cpp index 291c1d441d..e202f5e0f7 100644 --- a/examples/statemachine/eventtransitions/main.cpp +++ b/examples/statemachine/eventtransitions/main.cpp @@ -108,11 +108,7 @@ int main(int argc, char **argv) QApplication app(argc, argv); Window window; window.resize(300, 300); -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/statemachine/factorial/factorial.pro b/examples/statemachine/factorial/factorial.pro index 6fbfd8e598..fe3dd23e87 100644 --- a/examples/statemachine/factorial/factorial.pro +++ b/examples/statemachine/factorial/factorial.pro @@ -10,7 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS factorial.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/factorial INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example does not work on Symbian platform) diff --git a/examples/statemachine/pingpong/pingpong.pro b/examples/statemachine/pingpong/pingpong.pro index e15f593d84..1cfddaf282 100644 --- a/examples/statemachine/pingpong/pingpong.pro +++ b/examples/statemachine/pingpong/pingpong.pro @@ -10,7 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pingpong.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/pingpong INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example -symbian: warning(This example does not work on Symbian platform) diff --git a/examples/statemachine/rogue/main.cpp b/examples/statemachine/rogue/main.cpp index 2939e4a7c5..b52b55fccf 100644 --- a/examples/statemachine/rogue/main.cpp +++ b/examples/statemachine/rogue/main.cpp @@ -47,11 +47,7 @@ int main(int argv, char **args) QApplication app(argv, args); Window window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/statemachine/rogue/rogue.pro b/examples/statemachine/rogue/rogue.pro index 001f3e44a3..4ed132db06 100644 --- a/examples/statemachine/rogue/rogue.pro +++ b/examples/statemachine/rogue/rogue.pro @@ -10,6 +10,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/rogue INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/statemachine/rogue/window.cpp b/examples/statemachine/rogue/window.cpp index fa62362ecc..d5c06608c1 100644 --- a/examples/statemachine/rogue/window.cpp +++ b/examples/statemachine/rogue/window.cpp @@ -63,11 +63,7 @@ Window::Window() } } } -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR) - font.setPointSize(5); -#else font.setPointSize(12); -#endif setFont(font); //![1] diff --git a/examples/statemachine/rogue/window.h b/examples/statemachine/rogue/window.h index bdadad463d..025ec79600 100644 --- a/examples/statemachine/rogue/window.h +++ b/examples/statemachine/rogue/window.h @@ -49,13 +49,8 @@ class QStateMachine; class QTransition; QT_END_NAMESPACE -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR) -#define WIDTH 43 -#define HEIGHT 14 -#else #define WIDTH 35 #define HEIGHT 20 -#endif //![0] class Window : public QWidget diff --git a/examples/statemachine/trafficlight/main.cpp b/examples/statemachine/trafficlight/main.cpp index 353dfb721e..9b10360ae2 100644 --- a/examples/statemachine/trafficlight/main.cpp +++ b/examples/statemachine/trafficlight/main.cpp @@ -88,9 +88,6 @@ public: : QWidget(parent) { QVBoxLayout *vbox = new QVBoxLayout(this); -#ifdef Q_WS_MAEMO_5 - vbox->setContentsMargins(320, 0, 320, 0); -#endif m_red = new LightWidget(Qt::red); vbox->addWidget(m_red); m_yellow = new LightWidget(Qt::yellow); @@ -177,14 +174,8 @@ int main(int argc, char **argv) QApplication app(argc, argv); TrafficLight widget; -#if defined(Q_OS_SYMBIAN) - widget.showMaximized(); -#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - widget.show(); -#else widget.resize(110, 300); widget.show(); -#endif return app.exec(); } diff --git a/examples/statemachine/trafficlight/trafficlight.pro b/examples/statemachine/trafficlight/trafficlight.pro index 9ea94f75f0..5bc0cdaef5 100644 --- a/examples/statemachine/trafficlight/trafficlight.pro +++ b/examples/statemachine/trafficlight/trafficlight.pro @@ -7,6 +7,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/trafficlight INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/statemachine/twowaybutton/main.cpp b/examples/statemachine/twowaybutton/main.cpp index 3956c2e1c4..a6c7000446 100644 --- a/examples/statemachine/twowaybutton/main.cpp +++ b/examples/statemachine/twowaybutton/main.cpp @@ -74,14 +74,8 @@ int main(int argc, char **argv) //! [4] //! [5] -#if defined(Q_OS_SYMBIAN) - button.showMaximized(); -#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - button.show(); -#else button.resize(100, 50); button.show(); -#endif return app.exec(); } //! [5] diff --git a/examples/statemachine/twowaybutton/twowaybutton.pro b/examples/statemachine/twowaybutton/twowaybutton.pro index 3b37be7d9e..ffbd982845 100644 --- a/examples/statemachine/twowaybutton/twowaybutton.pro +++ b/examples/statemachine/twowaybutton/twowaybutton.pro @@ -7,6 +7,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/statemachine/twowaybutton INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example |