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/imagecomposition | |
| 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/imagecomposition')
| -rw-r--r-- | examples/painting/imagecomposition/imagecomposer.cpp | 7 | ||||
| -rw-r--r-- | examples/painting/imagecomposition/imagecomposition.pro | 5 | ||||
| -rw-r--r-- | examples/painting/imagecomposition/main.cpp | 4 |
3 files changed, 0 insertions, 16 deletions
diff --git a/examples/painting/imagecomposition/imagecomposer.cpp b/examples/painting/imagecomposition/imagecomposer.cpp index e0173ff6d6..fee4f2a338 100644 --- a/examples/painting/imagecomposition/imagecomposer.cpp +++ b/examples/painting/imagecomposition/imagecomposer.cpp @@ -43,11 +43,7 @@ #include "imagecomposer.h" //! [0] -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_SIMULATOR) -static const QSize resultSize(50, 50); -#else static const QSize resultSize(200, 200); -#endif //! [0] //! [1] @@ -108,10 +104,7 @@ ImageComposer::ImageComposer() mainLayout->addWidget(destinationButton, 0, 2, 3, 1); mainLayout->addWidget(equalLabel, 1, 3); mainLayout->addWidget(resultLabel, 0, 4, 3, 1); -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR) -#else mainLayout->setSizeConstraint(QLayout::SetFixedSize); -#endif setLayout(mainLayout); //! [4] diff --git a/examples/painting/imagecomposition/imagecomposition.pro b/examples/painting/imagecomposition/imagecomposition.pro index e8841ea770..edf434f5d2 100644 --- a/examples/painting/imagecomposition/imagecomposition.pro +++ b/examples/painting/imagecomposition/imagecomposition.pro @@ -9,10 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES images *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/imagecomposition INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000A64B - CONFIG += qt_example -} QT += widgets -maemo5: CONFIG += qt_example diff --git a/examples/painting/imagecomposition/main.cpp b/examples/painting/imagecomposition/main.cpp index f97a3ff7ef..e70fa5fae9 100644 --- a/examples/painting/imagecomposition/main.cpp +++ b/examples/painting/imagecomposition/main.cpp @@ -49,11 +49,7 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); ImageComposer composer; -#if defined(Q_OS_SYMBIAN) - composer.showMaximized(); -#else composer.show(); -#endif return app.exec(); } //! [0] |