summaryrefslogtreecommitdiffstats
path: root/examples/animation
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2011-10-18 09:54:31 +0200
committerQt by Nokia <qt-info@nokia.com>2011-10-18 15:47:49 +0200
commit87274e272d2a854563066489e20d019b4e6320de (patch)
treed01e71403a41db3ca2b83599fcc7036d79d7a13e /examples/animation
parent08e24858607d1b1483fb1faa54effa957501cfbb (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/animation')
-rw-r--r--examples/animation/animatedtiles/animatedtiles.pro5
-rw-r--r--examples/animation/animatedtiles/main.cpp4
-rw-r--r--examples/animation/appchooser/appchooser.pro5
-rw-r--r--examples/animation/appchooser/main.cpp4
-rw-r--r--examples/animation/easing/easing.pro5
-rw-r--r--examples/animation/easing/main.cpp6
-rw-r--r--examples/animation/easing/window.cpp4
-rw-r--r--examples/animation/moveblocks/main.cpp5
-rw-r--r--examples/animation/moveblocks/moveblocks.pro5
-rw-r--r--examples/animation/states/main.cpp4
-rw-r--r--examples/animation/states/states.pro5
-rw-r--r--examples/animation/stickman/main.cpp25
-rw-r--r--examples/animation/stickman/stickman.pro5
13 files changed, 0 insertions, 82 deletions
diff --git a/examples/animation/animatedtiles/animatedtiles.pro b/examples/animation/animatedtiles/animatedtiles.pro
index 791bbf6a22..1bba99449c 100644
--- a/examples/animation/animatedtiles/animatedtiles.pro
+++ b/examples/animation/animatedtiles/animatedtiles.pro
@@ -7,9 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animatedtiles.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/animatedtiles
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000D7D1
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/animation/animatedtiles/main.cpp b/examples/animation/animatedtiles/main.cpp
index c59c981cb1..55dbd39ec1 100644
--- a/examples/animation/animatedtiles/main.cpp
+++ b/examples/animation/animatedtiles/main.cpp
@@ -210,11 +210,7 @@ int main(int argc, char **argv)
view->setBackgroundBrush(bgPix);
view->setCacheMode(QGraphicsView::CacheBackground);
view->setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform);
-#ifdef Q_OS_SYMBIAN
- view->showMaximized();
-#else
view->show();
-#endif
QStateMachine states;
states.addState(rootState);
diff --git a/examples/animation/appchooser/appchooser.pro b/examples/animation/appchooser/appchooser.pro
index 3969b551e9..158a0eca9f 100644
--- a/examples/animation/appchooser/appchooser.pro
+++ b/examples/animation/appchooser/appchooser.pro
@@ -7,9 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/appchooser
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000E3F5
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/animation/appchooser/main.cpp b/examples/animation/appchooser/main.cpp
index 873054ce5f..55068c6a67 100644
--- a/examples/animation/appchooser/main.cpp
+++ b/examples/animation/appchooser/main.cpp
@@ -164,12 +164,8 @@ int main(int argc, char **argv)
machine.setInitialState(group);
machine.start();
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- window.showMaximized();
-#else
window.resize(300, 300);
window.show();
-#endif
return app.exec();
}
diff --git a/examples/animation/easing/easing.pro b/examples/animation/easing/easing.pro
index b26ce30083..155d17d9b9 100644
--- a/examples/animation/easing/easing.pro
+++ b/examples/animation/easing/easing.pro
@@ -13,10 +13,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS easing.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/easing
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000E3F6
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/animation/easing/main.cpp b/examples/animation/easing/main.cpp
index 0d63a3136e..7936810812 100644
--- a/examples/animation/easing/main.cpp
+++ b/examples/animation/easing/main.cpp
@@ -47,14 +47,8 @@ int main(int argc, char **argv)
QApplication app(argc, argv);
Window w;
-#if defined(Q_OS_SYMBIAN)
- w.showMaximized();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- w.show();
-#else
w.resize(400, 400);
w.show();
-#endif
return app.exec();
}
diff --git a/examples/animation/easing/window.cpp b/examples/animation/easing/window.cpp
index 869bca4798..208acd04fc 100644
--- a/examples/animation/easing/window.cpp
+++ b/examples/animation/easing/window.cpp
@@ -42,11 +42,7 @@
Window::Window(QWidget *parent)
: QWidget(parent),
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR)
- m_iconSize(32, 32)
-#else
m_iconSize(64, 64)
-#endif
{
m_ui.setupUi(this);
QButtonGroup *buttonGroup = findChild<QButtonGroup *>(); // ### workaround for uic in 4.4
diff --git a/examples/animation/moveblocks/main.cpp b/examples/animation/moveblocks/main.cpp
index 24e5f051d7..a5aba4549a 100644
--- a/examples/animation/moveblocks/main.cpp
+++ b/examples/animation/moveblocks/main.cpp
@@ -310,13 +310,8 @@ int main(int argc, char **argv)
machine.start();
//![9]
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5)
- window.showMaximized();
- window.fitInView(scene.sceneRect() );
-#else
window.resize(300, 300);
window.show();
-#endif
qsrand(QTime(0,0,0).secsTo(QTime::currentTime()));
diff --git a/examples/animation/moveblocks/moveblocks.pro b/examples/animation/moveblocks/moveblocks.pro
index b82370dff6..7c242e31e6 100644
--- a/examples/animation/moveblocks/moveblocks.pro
+++ b/examples/animation/moveblocks/moveblocks.pro
@@ -6,9 +6,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS moveblocks.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/moveblocks
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000E3F7
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/animation/states/main.cpp b/examples/animation/states/main.cpp
index f37c2bdbbf..891254e069 100644
--- a/examples/animation/states/main.cpp
+++ b/examples/animation/states/main.cpp
@@ -277,11 +277,7 @@ int main(int argc, char *argv[])
GraphicsView view(&scene);
-#if defined(Q_OS_SYMBIAN)
- view.showMaximized();
-#else
view.show();
-#endif
return app.exec();
}
diff --git a/examples/animation/states/states.pro b/examples/animation/states/states.pro
index 5c0d28163b..adf0e8d58c 100644
--- a/examples/animation/states/states.pro
+++ b/examples/animation/states/states.pro
@@ -7,9 +7,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/states
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000E3F8
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/animation/stickman/main.cpp b/examples/animation/stickman/main.cpp
index c5c3eb316b..208d346c5c 100644
--- a/examples/animation/stickman/main.cpp
+++ b/examples/animation/stickman/main.cpp
@@ -56,11 +56,6 @@ int main(int argc, char **argv)
StickMan *stickMan = new StickMan;
stickMan->setDrawSticks(false);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- RectButton *buttonJump = new RectButton("Jump"); buttonJump->setPos(100, 125);
- RectButton *buttonDance = new RectButton("Dance"); buttonDance->setPos(100, 200);
- RectButton *buttonChill = new RectButton("Chill"); buttonChill->setPos(100, 275);
-#else
QGraphicsTextItem *textItem = new QGraphicsTextItem();
textItem->setHtml("<font color=\"white\"><b>Stickman</b>"
"<p>"
@@ -77,18 +72,11 @@ int main(int argc, char **argv)
qreal w = textItem->boundingRect().width();
QRectF stickManBoundingRect = stickMan->mapToScene(stickMan->boundingRect()).boundingRect();
textItem->setPos(-w / 2.0, stickManBoundingRect.bottom() + 25.0);
-#endif
QGraphicsScene scene;
scene.addItem(stickMan);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- scene.addItem(buttonJump);
- scene.addItem(buttonDance);
- scene.addItem(buttonChill);
-#else
scene.addItem(textItem);
-#endif
scene.setBackgroundBrush(Qt::black);
GraphicsView view;
@@ -101,28 +89,15 @@ int main(int argc, char **argv)
view.resize(sceneRect.width() + 100, sceneRect.height() + 100);
view.setSceneRect(sceneRect);
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- view.setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- view.setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
- view.showMaximized();
- view.fitInView(scene.sceneRect(), Qt::KeepAspectRatio);
-#else
view.show();
view.setFocus();
-#endif
LifeCycle cycle(stickMan, &view);
cycle.setDeathAnimation(":/animations/dead");
-#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- cycle.addActivity(":/animations/jumping", Qt::Key_J, buttonJump, SIGNAL(clicked()));
- cycle.addActivity(":/animations/dancing", Qt::Key_D, buttonDance, SIGNAL(clicked()));
- cycle.addActivity(":/animations/chilling", Qt::Key_C, buttonChill, SIGNAL(clicked()));
-#else
cycle.addActivity(":/animations/jumping", Qt::Key_J);
cycle.addActivity(":/animations/dancing", Qt::Key_D);
cycle.addActivity(":/animations/chilling", Qt::Key_C);
-#endif
cycle.start();
diff --git a/examples/animation/stickman/stickman.pro b/examples/animation/stickman/stickman.pro
index 340a502c90..43aaec113d 100644
--- a/examples/animation/stickman/stickman.pro
+++ b/examples/animation/stickman/stickman.pro
@@ -20,9 +20,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/animation/stickman
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000E3F9
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example