diff options
Diffstat (limited to 'examples/graphicsview')
25 files changed, 3 insertions, 111 deletions
diff --git a/examples/graphicsview/anchorlayout/anchorlayout.pro b/examples/graphicsview/anchorlayout/anchorlayout.pro index abe55f2ef6..7b18a621db 100644 --- a/examples/graphicsview/anchorlayout/anchorlayout.pro +++ b/examples/graphicsview/anchorlayout/anchorlayout.pro @@ -9,7 +9,5 @@ INSTALLS += target sources TARGET = anchorlayout 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/graphicsview/anchorlayout/main.cpp b/examples/graphicsview/anchorlayout/main.cpp index f9f93fb961..d19dd38f74 100644 --- a/examples/graphicsview/anchorlayout/main.cpp +++ b/examples/graphicsview/anchorlayout/main.cpp @@ -123,11 +123,7 @@ int main(int argc, char **argv) scene.setBackgroundBrush(Qt::darkGreen); QGraphicsView view(&scene); -#if defined(Q_WS_S60) - view.showMaximized(); -#else view.show(); -#endif return app.exec(); } diff --git a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro index 88fa8182ab..202c8d87a0 100644 --- a/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro +++ b/examples/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro @@ -11,10 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES basicgraphicslayouts.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/basicgraphicslayouts INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000A645 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example -simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/graphicsview/basicgraphicslayouts/main.cpp b/examples/graphicsview/basicgraphicslayouts/main.cpp index 4a9e8f91b4..5edd130403 100644 --- a/examples/graphicsview/basicgraphicslayouts/main.cpp +++ b/examples/graphicsview/basicgraphicslayouts/main.cpp @@ -51,12 +51,8 @@ int main(int argc, char **argv) Window *window = new Window; scene.addItem(window); QGraphicsView view(&scene); -#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - view.showMaximized(); -#else view.resize(600, 600); view.show(); -#endif return app.exec(); } diff --git a/examples/graphicsview/boxes/glextensions.h b/examples/graphicsview/boxes/glextensions.h index 54de548cd7..f9c5dbcaa9 100644 --- a/examples/graphicsview/boxes/glextensions.h +++ b/examples/graphicsview/boxes/glextensions.h @@ -69,7 +69,7 @@ glMapBuffer glUnmapBuffer */ -#ifndef Q_WS_MAC +#ifndef Q_OS_MAC # ifndef APIENTRYP # ifdef APIENTRY # define APIENTRYP APIENTRY * diff --git a/examples/graphicsview/chip/chip.pro b/examples/graphicsview/chip/chip.pro index 5bf1b88164..94a461a99e 100644 --- a/examples/graphicsview/chip/chip.pro +++ b/examples/graphicsview/chip/chip.pro @@ -18,4 +18,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/chip INSTALLS += target sources -symbian: CONFIG += qt_example diff --git a/examples/graphicsview/collidingmice/collidingmice.pro b/examples/graphicsview/collidingmice/collidingmice.pro index 1c1c2683cf..d8346023ba 100644 --- a/examples/graphicsview/collidingmice/collidingmice.pro +++ b/examples/graphicsview/collidingmice/collidingmice.pro @@ -13,10 +13,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS collidingmice.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/collidingmice INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000A643 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example -simulator: warning(This example might not fully work on Simulator platform) + diff --git a/examples/graphicsview/collidingmice/main.cpp b/examples/graphicsview/collidingmice/main.cpp index 561887995e..5bba2756ce 100644 --- a/examples/graphicsview/collidingmice/main.cpp +++ b/examples/graphicsview/collidingmice/main.cpp @@ -79,12 +79,8 @@ int main(int argc, char **argv) view.setDragMode(QGraphicsView::ScrollHandDrag); //! [5] //! [6] view.setWindowTitle(QT_TRANSLATE_NOOP(QGraphicsView, "Colliding Mice")); -#if defined(Q_WS_S60) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - view.showMaximized(); -#else view.resize(400, 300); view.show(); -#endif QTimer timer; QObject::connect(&timer, SIGNAL(timeout()), &scene, SLOT(advance())); diff --git a/examples/graphicsview/diagramscene/diagramscene.pro b/examples/graphicsview/diagramscene/diagramscene.pro index 99cd4dea78..e45f4a894b 100644 --- a/examples/graphicsview/diagramscene/diagramscene.pro +++ b/examples/graphicsview/diagramscene/diagramscene.pro @@ -18,10 +18,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/diagramscene INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example QT += widgets -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/graphicsview/dragdroprobot/dragdroprobot.pro b/examples/graphicsview/dragdroprobot/dragdroprobot.pro index db5d94a600..3e33bad2f9 100644 --- a/examples/graphicsview/dragdroprobot/dragdroprobot.pro +++ b/examples/graphicsview/dragdroprobot/dragdroprobot.pro @@ -17,8 +17,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/dragdroprobot 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/graphicsview/dragdroprobot/main.cpp b/examples/graphicsview/dragdroprobot/main.cpp index 9b6f95c7a2..c90aef0599 100644 --- a/examples/graphicsview/dragdroprobot/main.cpp +++ b/examples/graphicsview/dragdroprobot/main.cpp @@ -55,9 +55,6 @@ public: protected: virtual void resizeEvent(QResizeEvent *) { -#if defined(Q_OS_SYMBIAN) - fitInView(sceneRect(), Qt::KeepAspectRatio); -#endif } }; @@ -90,11 +87,7 @@ int main(int argc, char **argv) view.setViewportUpdateMode(QGraphicsView::BoundingRectViewportUpdate); view.setBackgroundBrush(QColor(230, 200, 167)); view.setWindowTitle("Drag and Drop Robot"); -#if defined(Q_OS_SYMBIAN) - view.showMaximized(); -#else view.show(); -#endif return app.exec(); } diff --git a/examples/graphicsview/elasticnodes/elasticnodes.pro b/examples/graphicsview/elasticnodes/elasticnodes.pro index 6b591a8c66..2a61809457 100644 --- a/examples/graphicsview/elasticnodes/elasticnodes.pro +++ b/examples/graphicsview/elasticnodes/elasticnodes.pro @@ -17,11 +17,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS elasticnodes.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/elasticnodes INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000A642 - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example - -simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/graphicsview/elasticnodes/graphwidget.cpp b/examples/graphicsview/elasticnodes/graphwidget.cpp index 48a9784c54..6c54ca2381 100644 --- a/examples/graphicsview/elasticnodes/graphwidget.cpp +++ b/examples/graphicsview/elasticnodes/graphwidget.cpp @@ -203,7 +203,6 @@ void GraphWidget::drawBackground(QPainter *painter, const QRectF &rect) painter->setBrush(Qt::NoBrush); painter->drawRect(sceneRect); -#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) // Text QRectF textRect(sceneRect.left() + 4, sceneRect.top() + 4, sceneRect.width() - 4, sceneRect.height() - 4); @@ -218,7 +217,6 @@ void GraphWidget::drawBackground(QPainter *painter, const QRectF &rect) painter->drawText(textRect.translated(2, 2), message); painter->setPen(Qt::black); painter->drawText(textRect, message); -#endif } //! [6] diff --git a/examples/graphicsview/elasticnodes/main.cpp b/examples/graphicsview/elasticnodes/main.cpp index 9eb8ba11be..1c04057d1e 100644 --- a/examples/graphicsview/elasticnodes/main.cpp +++ b/examples/graphicsview/elasticnodes/main.cpp @@ -52,13 +52,6 @@ int main(int argc, char **argv) QMainWindow mainWindow; mainWindow.setCentralWidget(widget); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) - mainWindow.menuBar()->addAction("Shuffle", widget, SLOT(shuffle())); - mainWindow.menuBar()->addAction("Zoom In", widget, SLOT(zoomIn())); - mainWindow.menuBar()->addAction("Zoom Out", widget, SLOT(zoomOut())); - mainWindow.showMaximized(); -#else mainWindow.show(); -#endif return app.exec(); } diff --git a/examples/graphicsview/elasticnodes/node.cpp b/examples/graphicsview/elasticnodes/node.cpp index b345f83640..076d8232a1 100644 --- a/examples/graphicsview/elasticnodes/node.cpp +++ b/examples/graphicsview/elasticnodes/node.cpp @@ -141,16 +141,9 @@ bool Node::advance() //! [8] QRectF Node::boundingRect() const { -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) - // Add some extra space around the circle for easier touching with finger - qreal adjust = 30; - return QRectF( -10 - adjust, -10 - adjust, - 20 + adjust * 2, 20 + adjust * 2); -#else qreal adjust = 2; return QRectF( -10 - adjust, -10 - adjust, 23 + adjust, 23 + adjust); -#endif } //! [8] @@ -158,12 +151,7 @@ QRectF Node::boundingRect() const QPainterPath Node::shape() const { QPainterPath path; -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) - // Add some extra space around the circle for easier touching with finger - path.addEllipse( -40, -40, 80, 80); -#else path.addEllipse(-10, -10, 20, 20); -#endif return path; } //! [9] diff --git a/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro b/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro index 1f4ef91946..6244df4b68 100644 --- a/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro +++ b/examples/graphicsview/embeddeddialogs/embeddeddialogs.pro @@ -17,4 +17,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/embeddeddialogs INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example diff --git a/examples/graphicsview/flowlayout/flowlayout.pro b/examples/graphicsview/flowlayout/flowlayout.pro index f8d1e4871f..8d1f7b85ff 100644 --- a/examples/graphicsview/flowlayout/flowlayout.pro +++ b/examples/graphicsview/flowlayout/flowlayout.pro @@ -9,6 +9,4 @@ HEADERS += flowlayout.h window.h SOURCES += flowlayout.cpp main.cpp window.cpp 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/graphicsview/flowlayout/main.cpp b/examples/graphicsview/flowlayout/main.cpp index 8f5a0faede..88bbb79d4c 100644 --- a/examples/graphicsview/flowlayout/main.cpp +++ b/examples/graphicsview/flowlayout/main.cpp @@ -50,12 +50,8 @@ int main(int argc, char **argv) Window *w = new Window; scene.addItem(w); -#if defined(Q_OS_SYMBIAN) - view->showMaximized(); -#else view->resize(400, 300); view->show(); -#endif return app.exec(); } diff --git a/examples/graphicsview/graphicsview.pro b/examples/graphicsview/graphicsview.pro index a9aeb0d17f..6b7de527c6 100644 --- a/examples/graphicsview/graphicsview.pro +++ b/examples/graphicsview/graphicsview.pro @@ -5,9 +5,7 @@ SUBDIRS = \ embeddeddialogs \ collidingmice \ padnavigator \ - basicgraphicslayouts - -!symbian: SUBDIRS += \ + basicgraphicslayouts \ diagramscene \ dragdroprobot \ flowlayout \ @@ -27,6 +25,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview INSTALLS += target sources -symbian: CONFIG += qt_example QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/graphicsview/padnavigator/main.cpp b/examples/graphicsview/padnavigator/main.cpp index 9a397c783a..4cdf71c8e6 100644 --- a/examples/graphicsview/padnavigator/main.cpp +++ b/examples/graphicsview/padnavigator/main.cpp @@ -49,11 +49,7 @@ int main(int argc, char *argv[]) Q_INIT_RESOURCE(padnavigator); PadNavigator navigator(QSize(3, 3)); -#if defined(Q_OS_SYMBIAN) - navigator.showMaximized(); -#else navigator.show(); -#endif return app.exec(); } //! [0] diff --git a/examples/graphicsview/padnavigator/padnavigator.pro b/examples/graphicsview/padnavigator/padnavigator.pro index f0287f1f86..2c1d043a92 100644 --- a/examples/graphicsview/padnavigator/padnavigator.pro +++ b/examples/graphicsview/padnavigator/padnavigator.pro @@ -25,11 +25,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/padnavigator INSTALLS += target sources CONFIG += console - -symbian { - TARGET.UID3 = 0xA000A644 - CONFIG += qt_example -} -maemo5: CONFIG += qt_example - -simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/graphicsview/simpleanchorlayout/main.cpp b/examples/graphicsview/simpleanchorlayout/main.cpp index ff1ac2ba59..a909552f6a 100644 --- a/examples/graphicsview/simpleanchorlayout/main.cpp +++ b/examples/graphicsview/simpleanchorlayout/main.cpp @@ -127,14 +127,8 @@ int main(int argc, char *argv[]) view->setScene(scene); view->setWindowTitle(QApplication::translate("simpleanchorlayout", "Simple Anchor Layout")); -#if defined(Q_OS_SYMBIAN) - view->showMaximized(); -#elif defined(Q_WS_MAEMO_5) - view-show(); -#else view->resize(360, 320); view->show(); -#endif return app.exec(); } diff --git a/examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro b/examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro index 80cc3a1a24..b044d4e91c 100644 --- a/examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro +++ b/examples/graphicsview/simpleanchorlayout/simpleanchorlayout.pro @@ -9,6 +9,4 @@ INSTALLS += target sources TARGET = simpleanchorlayout 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/graphicsview/weatheranchorlayout/main.cpp b/examples/graphicsview/weatheranchorlayout/main.cpp index b1f2c724a1..e87756b664 100644 --- a/examples/graphicsview/weatheranchorlayout/main.cpp +++ b/examples/graphicsview/weatheranchorlayout/main.cpp @@ -190,10 +190,7 @@ int main(int argc, char **argv) QApplication app(argc, argv); QGraphicsScene scene; -#if defined(Q_OS_SYMBIAN) -#else scene.setSceneRect(0, 0, 800, 480); -#endif // pixmaps widgets PixmapWidget *title = new PixmapWidget(QPixmap(":/images/title.jpg")); @@ -268,13 +265,8 @@ int main(int argc, char **argv) // QGV setup scene.addItem(w); scene.setBackgroundBrush(Qt::white); -#if defined(Q_OS_SYMBIAN) - GraphicsView *view = new GraphicsView(&scene, w); - view->showMaximized(); -#else QGraphicsView *view = new QGraphicsView(&scene); view->show(); -#endif return app.exec(); } diff --git a/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro b/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro index 5f1dfd38e1..4c2fdc60de 100644 --- a/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro +++ b/examples/graphicsview/weatheranchorlayout/weatheranchorlayout.pro @@ -13,6 +13,4 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/graphicsview/weatheranchorlayout INSTALLS += target sources QT += widgets -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example simulator: warning(This example might not fully work on Simulator platform) |