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/effects/blurpicker/blurpicker.cpp | 3 --- examples/effects/blurpicker/blurpicker.pro | 2 -- examples/effects/blurpicker/main.cpp | 4 ---- examples/effects/fademessage/fademessage.cpp | 4 ---- examples/effects/fademessage/fademessage.pro | 2 -- examples/effects/fademessage/main.cpp | 4 ---- examples/effects/lighting/lighting.cpp | 3 --- examples/effects/lighting/lighting.pro | 2 -- examples/effects/lighting/main.cpp | 4 ---- 9 files changed, 28 deletions(-) (limited to 'examples/effects') diff --git a/examples/effects/blurpicker/blurpicker.cpp b/examples/effects/blurpicker/blurpicker.cpp index 5883c741be..00771a5818 100644 --- a/examples/effects/blurpicker/blurpicker.cpp +++ b/examples/effects/blurpicker/blurpicker.cpp @@ -139,9 +139,6 @@ void BlurPicker::keyPressEvent(QKeyEvent *event) void BlurPicker::resizeEvent(QResizeEvent */*event*/) { -#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - fitInView(sceneRect(), Qt::KeepAspectRatio); -#endif } void BlurPicker::mousePressEvent(QMouseEvent *event) diff --git a/examples/effects/blurpicker/blurpicker.pro b/examples/effects/blurpicker/blurpicker.pro index ca651b8858..c477ea6e39 100644 --- a/examples/effects/blurpicker/blurpicker.pro +++ b/examples/effects/blurpicker/blurpicker.pro @@ -9,5 +9,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/blurpicker INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/effects/blurpicker/main.cpp b/examples/effects/blurpicker/main.cpp index 5138fccfcf..2fbe1f139f 100644 --- a/examples/effects/blurpicker/main.cpp +++ b/examples/effects/blurpicker/main.cpp @@ -48,12 +48,8 @@ int main(int argc, char **argv) BlurPicker blurPicker; blurPicker.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Application Picker")); -#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - blurPicker.showMaximized(); -#else blurPicker.setFixedSize(400, 300); blurPicker.show(); -#endif return app.exec(); } diff --git a/examples/effects/fademessage/fademessage.cpp b/examples/effects/fademessage/fademessage.cpp index b6e94e5e2e..27d84b52bc 100644 --- a/examples/effects/fademessage/fademessage.cpp +++ b/examples/effects/fademessage/fademessage.cpp @@ -124,9 +124,5 @@ void FadeMessage::setupScene() connect(press, SIGNAL(clicked()), SLOT(togglePopup())); m_scene.addWidget(press); -#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) - press->move(200, 210); -#else press->move(300, 500); -#endif } diff --git a/examples/effects/fademessage/fademessage.pro b/examples/effects/fademessage/fademessage.pro index 261bee42f9..c40ee76a2c 100644 --- a/examples/effects/fademessage/fademessage.pro +++ b/examples/effects/fademessage/fademessage.pro @@ -12,8 +12,6 @@ sources.files = $$SOURCES \ fademessage.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/fademessage -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/effects/fademessage/main.cpp b/examples/effects/fademessage/main.cpp index 8c72a458b0..83d6d8eab8 100644 --- a/examples/effects/fademessage/main.cpp +++ b/examples/effects/fademessage/main.cpp @@ -48,12 +48,8 @@ int main(int argc, char **argv) FadeMessage widget; widget.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Popup Message with Effect")); -#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) - widget.showMaximized(); -#else widget.setFixedSize(400, 600); widget.show(); -#endif return app.exec(); } diff --git a/examples/effects/lighting/lighting.cpp b/examples/effects/lighting/lighting.cpp index 4532fafe25..3c9fed7ec7 100644 --- a/examples/effects/lighting/lighting.cpp +++ b/examples/effects/lighting/lighting.cpp @@ -136,7 +136,4 @@ void Lighting::animate() void Lighting::resizeEvent(QResizeEvent */*event*/) { -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - fitInView(sceneRect(), Qt::KeepAspectRatio); -#endif } diff --git a/examples/effects/lighting/lighting.pro b/examples/effects/lighting/lighting.pro index 1876a7b3af..16be936b26 100644 --- a/examples/effects/lighting/lighting.pro +++ b/examples/effects/lighting/lighting.pro @@ -8,6 +8,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/effects/lighting INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example diff --git a/examples/effects/lighting/main.cpp b/examples/effects/lighting/main.cpp index fff3d73f2a..69063a5672 100644 --- a/examples/effects/lighting/main.cpp +++ b/examples/effects/lighting/main.cpp @@ -48,12 +48,8 @@ int main(int argc, char **argv) Lighting lighting; lighting.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Lighting and Shadows")); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - lighting.showMaximized(); -#else lighting.resize(640, 480); lighting.show(); -#endif return app.exec(); } -- cgit v1.2.3