summaryrefslogtreecommitdiffstats
path: root/examples/painting/imagecomposition
diff options
context:
space:
mode:
Diffstat (limited to 'examples/painting/imagecomposition')
-rw-r--r--examples/painting/imagecomposition/imagecomposer.cpp7
-rw-r--r--examples/painting/imagecomposition/imagecomposition.pro5
-rw-r--r--examples/painting/imagecomposition/main.cpp4
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]