summaryrefslogtreecommitdiffstats
path: root/examples/painting
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/painting
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/painting')
-rw-r--r--examples/painting/affine/affine.pro6
-rw-r--r--examples/painting/basicdrawing/basicdrawing.pro7
-rw-r--r--examples/painting/basicdrawing/main.cpp4
-rw-r--r--examples/painting/basicdrawing/window.cpp7
-rw-r--r--examples/painting/composition/composition.cpp22
-rw-r--r--examples/painting/composition/composition.h6
-rw-r--r--examples/painting/composition/composition.pro1
-rw-r--r--examples/painting/concentriccircles/concentriccircles.pro5
-rw-r--r--examples/painting/concentriccircles/main.cpp4
-rw-r--r--examples/painting/deform/deform.pro5
-rw-r--r--examples/painting/fontsampler/fontsampler.pro2
-rw-r--r--examples/painting/fontsampler/main.cpp4
-rw-r--r--examples/painting/fontsampler/mainwindow.cpp7
-rw-r--r--examples/painting/gradients/gradients.pro1
-rw-r--r--examples/painting/imagecomposition/imagecomposer.cpp7
-rw-r--r--examples/painting/imagecomposition/imagecomposition.pro5
-rw-r--r--examples/painting/imagecomposition/main.cpp4
-rw-r--r--examples/painting/painterpaths/main.cpp4
-rw-r--r--examples/painting/painterpaths/painterpaths.pro7
-rw-r--r--examples/painting/painterpaths/window.cpp10
-rw-r--r--examples/painting/painting.pro2
-rw-r--r--examples/painting/pathstroke/pathstroke.pro4
-rw-r--r--examples/painting/shared/arthurwidgets.cpp12
-rw-r--r--examples/painting/shared/shared.pri3
-rw-r--r--examples/painting/shared/shared.pro5
-rw-r--r--examples/painting/transformations/main.cpp4
-rw-r--r--examples/painting/transformations/transformations.pro9
27 files changed, 2 insertions, 155 deletions
diff --git a/examples/painting/affine/affine.pro b/examples/painting/affine/affine.pro
index 1441811851..80f966e59d 100644
--- a/examples/painting/affine/affine.pro
+++ b/examples/painting/affine/affine.pro
@@ -18,12 +18,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/affine
INSTALLS += target sources
-symbian {
- CONFIG += qt_example
-}
-
-maemo5: CONFIG += qt_example
-
wince*: {
DEPLOYMENT_PLUGIN += qjpeg
}
diff --git a/examples/painting/basicdrawing/basicdrawing.pro b/examples/painting/basicdrawing/basicdrawing.pro
index 0e9c699698..0e0328e61f 100644
--- a/examples/painting/basicdrawing/basicdrawing.pro
+++ b/examples/painting/basicdrawing/basicdrawing.pro
@@ -11,11 +11,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basicdrawing.pro images
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/basicdrawing
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A649
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
-
-simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/painting/basicdrawing/main.cpp b/examples/painting/basicdrawing/main.cpp
index aa839f68cc..6662742166 100644
--- a/examples/painting/basicdrawing/main.cpp
+++ b/examples/painting/basicdrawing/main.cpp
@@ -48,10 +48,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/basicdrawing/window.cpp b/examples/painting/basicdrawing/window.cpp
index 6f750c45d1..949f4c8179 100644
--- a/examples/painting/basicdrawing/window.cpp
+++ b/examples/painting/basicdrawing/window.cpp
@@ -74,11 +74,7 @@ Window::Window()
//! [2]
penWidthSpinBox = new QSpinBox;
penWidthSpinBox->setRange(0, 20);
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- penWidthSpinBox->setSpecialValueText(tr("0"));
-#else
penWidthSpinBox->setSpecialValueText(tr("0 (cosmetic pen)"));
-#endif
penWidthLabel = new QLabel(tr("Pen &Width:"));
penWidthLabel->setBuddy(penWidthSpinBox);
@@ -172,9 +168,6 @@ Window::Window()
//! [9]
QGridLayout *mainLayout = new QGridLayout;
//! [9] //! [10]
-#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) || defined(Q_WS_SIMULATOR)
- mainLayout->setSizeConstraint(QLayout::SetNoConstraint);
-#endif
mainLayout->setColumnStretch(0, 1);
mainLayout->setColumnStretch(3, 1);
mainLayout->addWidget(renderArea, 0, 0, 1, 4);
diff --git a/examples/painting/composition/composition.cpp b/examples/painting/composition/composition.cpp
index b3f810b26c..e376d90733 100644
--- a/examples/painting/composition/composition.cpp
+++ b/examples/painting/composition/composition.cpp
@@ -239,13 +239,8 @@ CompositionRenderer::CompositionRenderer(QWidget *parent)
{
m_animation_enabled = true;
m_animationTimer = startTimer(animationInterval);
-#ifdef Q_WS_QWS
- m_image = QPixmap(":res/composition/flower.jpg");
- m_image.setAlphaChannel(QPixmap(":res/composition/flower_alpha.jpg"));
-#else
m_image = QImage(":res/composition/flower.jpg");
m_image.setAlphaChannel(QImage(":res/composition/flower_alpha.jpg"));
-#endif
m_circle_alpha = 127;
m_circle_hue = 255;
m_current_object = NoObject;
@@ -324,11 +319,7 @@ void CompositionRenderer::drawBase(QPainter &p)
p.setPen(Qt::NoPen);
p.setRenderHint(QPainter::SmoothPixmapTransform);
-#ifdef Q_WS_QWS
- p.drawPixmap(rect(), m_image);
-#else
p.drawImage(rect(), m_image);
-#endif
}
void CompositionRenderer::drawSource(QPainter &p)
@@ -456,37 +447,24 @@ void CompositionRenderer::paint(QPainter *painter)
{
// using a QImage
if (m_buffer.size() != size()) {
-#ifdef Q_WS_QWS
- m_base_buffer = QPixmap(size());
- m_base_buffer.fill(Qt::transparent);
-#else
m_buffer = QImage(size(), QImage::Format_ARGB32_Premultiplied);
m_base_buffer = QImage(size(), QImage::Format_ARGB32_Premultiplied);
m_base_buffer.fill(0);
-#endif
QPainter p(&m_base_buffer);
drawBase(p);
}
-#ifdef Q_WS_QWS
- m_buffer = m_base_buffer;
-#else
memcpy(m_buffer.bits(), m_base_buffer.bits(), m_buffer.byteCount());
-#endif
{
QPainter p(&m_buffer);
drawSource(p);
}
-#ifdef Q_WS_QWS
- painter->drawPixmap(0, 0, m_buffer);
-#else
painter->drawImage(0, 0, m_buffer);
-#endif
}
}
diff --git a/examples/painting/composition/composition.h b/examples/painting/composition/composition.h
index 86e8f5c0df..73d49bf227 100644
--- a/examples/painting/composition/composition.h
+++ b/examples/painting/composition/composition.h
@@ -161,15 +161,9 @@ private:
QPainter::CompositionMode m_composition_mode;
-#ifdef Q_WS_QWS
- QPixmap m_image;
- QPixmap m_buffer;
- QPixmap m_base_buffer;
-#else
QImage m_image;
QImage m_buffer;
QImage m_base_buffer;
-#endif
int m_circle_alpha;
int m_circle_hue;
diff --git a/examples/painting/composition/composition.pro b/examples/painting/composition/composition.pro
index c8e5ab0af3..8641109cc0 100644
--- a/examples/painting/composition/composition.pro
+++ b/examples/painting/composition/composition.pro
@@ -17,7 +17,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/composition
INSTALLS += target sources
-symbian: CONFIG += qt_example
win32-msvc* {
QMAKE_CXXFLAGS += /Zm500
diff --git a/examples/painting/concentriccircles/concentriccircles.pro b/examples/painting/concentriccircles/concentriccircles.pro
index a889673014..0f87b991ed 100644
--- a/examples/painting/concentriccircles/concentriccircles.pro
+++ b/examples/painting/concentriccircles/concentriccircles.pro
@@ -10,10 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS concentriccircles.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/concentriccircles
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A64A
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
diff --git a/examples/painting/concentriccircles/main.cpp b/examples/painting/concentriccircles/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/painting/concentriccircles/main.cpp
+++ b/examples/painting/concentriccircles/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/deform/deform.pro b/examples/painting/deform/deform.pro
index 2bfc5d32cd..bd704507c5 100644
--- a/examples/painting/deform/deform.pro
+++ b/examples/painting/deform/deform.pro
@@ -17,8 +17,3 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/deform
INSTALLS += target sources
-
-symbian {
- TARGET.UID3 = 0xA000A63D
- CONFIG += qt_example
-}
diff --git a/examples/painting/fontsampler/fontsampler.pro b/examples/painting/fontsampler/fontsampler.pro
index 63892a319a..539fc4894b 100644
--- a/examples/painting/fontsampler/fontsampler.pro
+++ b/examples/painting/fontsampler/fontsampler.pro
@@ -9,6 +9,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets printsupport
-maemo5: CONFIG += qt_example
diff --git a/examples/painting/fontsampler/main.cpp b/examples/painting/fontsampler/main.cpp
index dffe80348a..01c8adae53 100644
--- a/examples/painting/fontsampler/main.cpp
+++ b/examples/painting/fontsampler/main.cpp
@@ -46,10 +46,6 @@ int main(int argc, char *argv[])
{
QApplication app(argc, argv);
MainWindow window;
-#if defined(Q_OS_SYMBIAN)
- window.showMaximized();
-#else
window.show();
-#endif
return app.exec();
}
diff --git a/examples/painting/fontsampler/mainwindow.cpp b/examples/painting/fontsampler/mainwindow.cpp
index 9efd307f88..ad0ce55ede 100644
--- a/examples/painting/fontsampler/mainwindow.cpp
+++ b/examples/painting/fontsampler/mainwindow.cpp
@@ -50,9 +50,6 @@ MainWindow::MainWindow(QWidget *parent)
{
setupUi(this);
-#if defined(Q_OS_SYMBIAN)
- addDockWidget(Qt::BottomDockWidgetArea, dockWidget);
-#endif
sampleSizes << 32 << 24 << 16 << 14 << 12 << 8 << 4 << 2 << 1;
markedCount = 0;
@@ -147,11 +144,7 @@ void MainWindow::showFont(QTreeWidgetItem *item)
QString oldText = textEdit->toPlainText().trimmed();
bool modified = textEdit->document()->isModified();
textEdit->clear();
-#if defined(Q_OS_SYMBIAN)
- textEdit->document()->setDefaultFont(QFont(family, 10, weight, italic));
-#else
textEdit->document()->setDefaultFont(QFont(family, 32, weight, italic));
-#endif
QTextCursor cursor = textEdit->textCursor();
QTextBlockFormat blockFormat;
diff --git a/examples/painting/gradients/gradients.pro b/examples/painting/gradients/gradients.pro
index 66f19c0801..4d3efe1255 100644
--- a/examples/painting/gradients/gradients.pro
+++ b/examples/painting/gradients/gradients.pro
@@ -17,4 +17,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/gradients
INSTALLS += target sources
-symbian: CONFIG += qt_example
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]
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]
diff --git a/examples/painting/painting.pro b/examples/painting/painting.pro
index 263cc7326b..927d94006b 100644
--- a/examples/painting/painting.pro
+++ b/examples/painting/painting.pro
@@ -18,9 +18,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting
INSTALLS += target sources
-symbian: CONFIG += qt_example
QT += widgets
-maemo5: CONFIG += qt_example
examples_affine.subdir = affine
examples_composition.subdir = composition
diff --git a/examples/painting/pathstroke/pathstroke.pro b/examples/painting/pathstroke/pathstroke.pro
index d3f6596390..60a5cd75ca 100644
--- a/examples/painting/pathstroke/pathstroke.pro
+++ b/examples/painting/pathstroke/pathstroke.pro
@@ -18,7 +18,3 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/pathstroke
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A63E
- CONFIG += qt_example
-}
diff --git a/examples/painting/shared/arthurwidgets.cpp b/examples/painting/shared/arthurwidgets.cpp
index c1abc4bbe7..6a0183288c 100644
--- a/examples/painting/shared/arthurwidgets.cpp
+++ b/examples/painting/shared/arthurwidgets.cpp
@@ -108,11 +108,7 @@ void ArthurFrame::enableOpenGL(bool use_opengl)
void ArthurFrame::paintEvent(QPaintEvent *e)
{
-#ifdef Q_WS_QWS
- static QPixmap *static_image = 0;
-#else
static QImage *static_image = 0;
-#endif
QPainter painter;
if (preferImage()
#ifdef QT_OPENGL_SUPPORT
@@ -121,11 +117,7 @@ void ArthurFrame::paintEvent(QPaintEvent *e)
) {
if (!static_image || static_image->size() != size()) {
delete static_image;
-#ifdef Q_WS_QWS
- static_image = new QPixmap(size());
-#else
static_image = new QImage(size(), QImage::Format_RGB32);
-#endif
}
painter.begin(static_image);
@@ -197,11 +189,7 @@ void ArthurFrame::paintEvent(QPaintEvent *e)
) {
painter.end();
painter.begin(this);
-#ifdef Q_WS_QWS
- painter.drawPixmap(e->rect(), *static_image, e->rect());
-#else
painter.drawImage(e->rect(), *static_image, e->rect());
-#endif
}
#ifdef QT_OPENGL_SUPPORT
diff --git a/examples/painting/shared/shared.pri b/examples/painting/shared/shared.pri
index fb7b04c0be..2d6b3c78f9 100644
--- a/examples/painting/shared/shared.pri
+++ b/examples/painting/shared/shared.pri
@@ -16,6 +16,5 @@ contains(CONFIG, debug_and_release_target) {
hpux-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
hpuxi-acc*:LIBS += $$SHARED_FOLDER/libdemo_shared.a
-symbian:LIBS += -ldemo_shared.lib
-!hpuxi-acc*:!hpux-acc*:!symbian:LIBS += -ldemo_shared
+!hpuxi-acc*:!hpux-acc*:LIBS += -ldemo_shared
diff --git a/examples/painting/shared/shared.pro b/examples/painting/shared/shared.pro
index 8fc58ae814..212f3a20d7 100644
--- a/examples/painting/shared/shared.pro
+++ b/examples/painting/shared/shared.pro
@@ -32,8 +32,3 @@ sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/shared
INSTALLS += sources
!cross_compile:INSTALLS += target
-
-symbian {
- TARGET.UID3 = 0xA000A63C
- CONFIG += qt_demo
-}
diff --git a/examples/painting/transformations/main.cpp b/examples/painting/transformations/main.cpp
index 4a43828d45..f2079f511b 100644
--- a/examples/painting/transformations/main.cpp
+++ b/examples/painting/transformations/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/transformations/transformations.pro b/examples/painting/transformations/transformations.pro
index 2e76a13c5f..a261c53371 100644
--- a/examples/painting/transformations/transformations.pro
+++ b/examples/painting/transformations/transformations.pro
@@ -10,13 +10,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS transformations.pro
sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/transformations
INSTALLS += target sources
-symbian {
- TARGET.UID3 = 0xA000A64D
- CONFIG += qt_example
-}
QT += widgets
-maemo5: CONFIG += qt_example
-
-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)