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/painting/painterpaths | |
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/painting/painterpaths')
-rw-r--r-- | examples/painting/painterpaths/main.cpp | 4 | ||||
-rw-r--r-- | examples/painting/painterpaths/painterpaths.pro | 7 | ||||
-rw-r--r-- | examples/painting/painterpaths/window.cpp | 10 |
3 files changed, 1 insertions, 20 deletions
diff --git a/examples/painting/painterpaths/main.cpp b/examples/painting/painterpaths/main.cpp index 4a43828d45..f2079f511b 100644 --- a/examples/painting/painterpaths/main.cpp +++ b/examples/painting/painterpaths/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/painting/painterpaths/painterpaths.pro b/examples/painting/painterpaths/painterpaths.pro index 6ead35fe5a..c988ba26e0 100644 --- a/examples/painting/painterpaths/painterpaths.pro +++ b/examples/painting/painterpaths/painterpaths.pro @@ -3,7 +3,7 @@ HEADERS = renderarea.h \ SOURCES = main.cpp \ renderarea.cpp \ window.cpp -unix:!mac:!symbian:!vxworks:!integrity:LIBS += -lm +unix:!mac:!vxworks:!integrity:LIBS += -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/painterpaths @@ -11,10 +11,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painterpaths.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/painterpaths INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000A64C - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/painting/painterpaths/window.cpp b/examples/painting/painterpaths/window.cpp index 1139ad0258..641d3597ed 100644 --- a/examples/painting/painterpaths/window.cpp +++ b/examples/painting/painterpaths/window.cpp @@ -130,14 +130,12 @@ Window::Window() //! [9] //! [10] -#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR) renderAreas.push_back(new RenderArea(rectPath)); renderAreas.push_back(new RenderArea(roundRectPath)); renderAreas.push_back(new RenderArea(ellipsePath)); renderAreas.push_back(new RenderArea(piePath)); renderAreas.push_back(new RenderArea(polygonPath)); renderAreas.push_back(new RenderArea(groupPath)); -#endif renderAreas.push_back(new RenderArea(textPath)); renderAreas.push_back(new RenderArea(bezierPath)); renderAreas.push_back(new RenderArea(starPath)); @@ -211,18 +209,12 @@ Window::Window() //! [16] //! [17] QGridLayout *topLayout = new QGridLayout; -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - topLayout->setSizeConstraint(QLayout::SetNoConstraint); -#endif int i=0; for(QList<RenderArea*>::iterator it = renderAreas.begin(); it != renderAreas.end(); it++, i++) topLayout->addWidget(*it, i / 3, i % 3); QGridLayout *mainLayout = new QGridLayout; -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) - mainLayout->setSizeConstraint(QLayout::SetNoConstraint); -#endif mainLayout->addLayout(topLayout, 0, 0, 1, 4); mainLayout->addWidget(fillRuleLabel, 1, 0); mainLayout->addWidget(fillRuleComboBox, 1, 1, 1, 3); @@ -234,10 +226,8 @@ Window::Window() mainLayout->addWidget(penWidthSpinBox, 3, 1, 1, 3); mainLayout->addWidget(penColorLabel, 4, 0); mainLayout->addWidget(penColorComboBox, 4, 1, 1, 3); -#if !defined(Q_OS_SYMBIAN) && !defined(Q_WS_MAEMO_5) && !defined(Q_WS_SIMULATOR) mainLayout->addWidget(rotationAngleLabel, 5, 0); mainLayout->addWidget(rotationAngleSpinBox, 5, 1, 1, 3); -#endif setLayout(mainLayout); //! [17] |