From 423e63875a2aa78d2e9eb600b028104b590076d7 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Tue, 17 Apr 2012 13:19:00 +0300 Subject: Remove Symbian and Maemo code from QtSvg Change-Id: Ib951c2d3878dc9533131ee6d3dae122c4bbec807 Reviewed-by: Friedemann Kleint Reviewed-by: Simon Hausmann --- examples/desktop/systray/systray.pro | 5 - .../delayedencoding/delayedencoding.pro | 7 - examples/draganddrop/delayedencoding/main.cpp | 4 - examples/embedded/desktopservices/contenttab.cpp | 17 +- .../embedded/desktopservices/desktopservices.pro | 9 - .../embeddedsvgviewer/embeddedsvgviewer.pro | 4 - examples/embedded/fluidlauncher/fluidlauncher.pro | 206 --------------------- examples/embedded/weatherinfo/weatherinfo.cpp | 7 - examples/embedded/weatherinfo/weatherinfo.pro | 6 - examples/network/bearercloud/bearercloud.pro | 7 - examples/network/bearercloud/cloud.cpp | 3 +- examples/network/bearercloud/main.cpp | 2 +- examples/painting/svggenerator/main.cpp | 4 - examples/painting/svggenerator/svggenerator.pro | 6 - examples/painting/svggenerator/window.cpp | 4 - examples/painting/svgviewer/main.cpp | 4 - examples/painting/svgviewer/svgviewer.pro | 9 - examples/richtext/textobject/main.cpp | 4 - examples/richtext/textobject/textobject.pro | 2 - src/plugins/imageformats/svg/svg.pro | 2 - 20 files changed, 5 insertions(+), 307 deletions(-) diff --git a/examples/desktop/systray/systray.pro b/examples/desktop/systray/systray.pro index 8e10fcc..8ce8a3a 100644 --- a/examples/desktop/systray/systray.pro +++ b/examples/desktop/systray/systray.pro @@ -10,8 +10,6 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS systray.pro resources im sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/desktop/systray INSTALLS += target sources -symbian: CONFIG += qt_example - wince* { CONFIG(debug, release|debug) { addPlugins.files = $$QT_BUILD_TREE/plugins/imageformats/qsvgd4.dll @@ -23,8 +21,5 @@ wince* { DEPLOYMENT += addPlugins } -maemo5: CONFIG += qt_example -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) simulator: warning(This example does not work on Simulator platform) QT+=widgets diff --git a/examples/draganddrop/delayedencoding/delayedencoding.pro b/examples/draganddrop/delayedencoding/delayedencoding.pro index 083a15b..36c3db6 100644 --- a/examples/draganddrop/delayedencoding/delayedencoding.pro +++ b/examples/draganddrop/delayedencoding/delayedencoding.pro @@ -13,12 +13,5 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/itemviews/delayedencoding INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000C614 - CONFIG += qt_example -} -maemo5: CONFIG += qt_example -symbian: warning(This example does not work on Symbian platform) -maemo5: warning(This example does not work on Maemo platform) simulator: warning(This example does not work on Simulator platform) QT+=widgets diff --git a/examples/draganddrop/delayedencoding/main.cpp b/examples/draganddrop/delayedencoding/main.cpp index 93e5efd..f92e3e7 100644 --- a/examples/draganddrop/delayedencoding/main.cpp +++ b/examples/draganddrop/delayedencoding/main.cpp @@ -45,11 +45,7 @@ int main(int argc, char *argv[]) { QApplication app(argc, argv); SourceWidget window; -#ifdef Q_OS_SYMBIAN - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/embedded/desktopservices/contenttab.cpp b/examples/embedded/desktopservices/contenttab.cpp index 6f4d1c1..00dc28b 100644 --- a/examples/embedded/desktopservices/contenttab.cpp +++ b/examples/embedded/desktopservices/contenttab.cpp @@ -131,20 +131,9 @@ void ContentTab::handleErrorInOpen(QListWidgetItem *item) // NEW SLOTS void ContentTab::openItem(QListWidgetItem *item) { -#if defined(Q_OS_SYMBIAN) && defined(Q_CC_NOKIAX86) - // Opening music files doesn't work in Symbian emulator and in some SDKs freezes the - // emulator entirely, so prevent it. - QStringList nameFilters = m_ContentDir.nameFilters(); - if (nameFilters.contains("*.mp3")) { - QMessageBox::warning(this, tr("Operation Failed"), tr("Action not supported in emulator."), - QMessageBox::Close); - } else -#endif - { - bool ret = QDesktopServices::openUrl(itemUrl(item)); - if (!ret) - handleErrorInOpen(item); - } + bool ret = QDesktopServices::openUrl(itemUrl(item)); + if (!ret) + handleErrorInOpen(item); } diff --git a/examples/embedded/desktopservices/desktopservices.pro b/examples/embedded/desktopservices/desktopservices.pro index d4e9206..9547d29 100644 --- a/examples/embedded/desktopservices/desktopservices.pro +++ b/examples/embedded/desktopservices/desktopservices.pro @@ -12,15 +12,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/desktopservices -symbian { - TARGET.UID3 = 0xA000C611 - CONFIG += qt_demo - ICON = ./resources/heart.svg - music.path = /data/sounds/ - image.path = /data/images/ - DEPLOYMENT += music image -} - wince*{ music.path = "\\My Documents\\My Music" image.path = "\\My Documents\\My Pictures" diff --git a/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.pro b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.pro index 514f14a..c48a317 100644 --- a/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.pro +++ b/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.pro @@ -14,7 +14,3 @@ wince* { DEPLOYMENT_PLUGIN += qsvg } -symbian { - TARGET.UID3 = 0xA000A640 - CONFIG += qt_demo -} diff --git a/examples/embedded/fluidlauncher/fluidlauncher.pro b/examples/embedded/fluidlauncher/fluidlauncher.pro index 1b65ab2..aadaf97 100644 --- a/examples/embedded/fluidlauncher/fluidlauncher.pro +++ b/examples/embedded/fluidlauncher/fluidlauncher.pro @@ -52,209 +52,3 @@ wince*{ DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg } - -symbian { - load(data_caging_paths) - CONFIG += qt_demo - RSS_RULES = # Clear RSS_RULES, otherwise fluidlauncher will get put into QtDemos folder - - TARGET.UID3 = 0xA000A641 - - defineReplace(regResourceDir) { - symbian-abld|symbian-sbsv2 { - return($${EPOCROOT}$$HW_ZDIR$$REG_RESOURCE_IMPORT_DIR/$$basename(1)) - } else { - return($${QT_BUILD_TREE}/$$1) - } - } - - defineReplace(appResourceDir) { - symbian-abld|symbian-sbsv2 { - return($${EPOCROOT}$${HW_ZDIR}$${APP_RESOURCE_DIR}/$$basename(1)) - } else { - return($${QT_BUILD_TREE}/$$1) - } - } - - executables.files = \ - $$QT_BUILD_TREE/qtbase/examples/embedded/styleexample/styleexample.exe \ - $$QT_BUILD_TREE/qtbase/examples/painting/deform/deform.exe \ - $$QT_BUILD_TREE/qtbase/examples/painting/pathstroke/pathstroke.exe \ - $$QT_BUILD_TREE/qtbase/examples/widgets/wiggly/wiggly.exe \ - $$QT_BUILD_TREE/qtbase/examples/network/qftp/qftp.exe \ - $$QT_BUILD_TREE/qtbase/examples/xml/saxbookmarks/saxbookmarks.exe \ - $$QT_BUILD_TREE/qtsvg/examples/embedded/desktopservices/desktopservices.exe \ - $$QT_BUILD_TREE/qtbase/examples/draganddrop/fridgemagnets/fridgemagnets.exe \ - $$QT_BUILD_TREE/qtbase/examples/widgets/softkeys/softkeys.exe \ - $$QT_BUILD_TREE/qtbase/examples/embedded/raycasting/raycasting.exe \ - $$QT_BUILD_TREE/qtbase/examples/embedded/flickable/flickable.exe \ - $$QT_BUILD_TREE/qtbase/examples/embedded/digiflip/digiflip.exe \ - $$QT_BUILD_TREE/qtbase/examples/embedded/lightmaps/lightmaps.exe \ - $$QT_BUILD_TREE/qtbase/examples/embedded/flightinfo/flightinfo.exe - - executables.path = /sys/bin - - reg_resource.files = \ - $$regResourceDir(qtbase/examples/embedded/styleexample/styleexample_reg.rsc) \ - $$regResourceDir(qtbase/examples/painting/deform/deform_reg.rsc) \ - $$regResourceDir(qtbase/examples/pathstroke/pathstroke_reg.rsc) \ - $$regResourceDir(qtbase/examples/widgets/wiggly/wiggly_reg.rsc) \ - $$regResourceDir(qtbase/examples/network/qftp/qftp_reg.rsc)\ - $$regResourceDir(qtbase/examples/xml/saxbookmarks/saxbookmarks_reg.rsc) \ - $$regResourceDir(qtsvg/examples/embedded/desktopservices/desktopservices_reg.rsc) \ - $$regResourceDir(qtbase/examples/draganddrop/fridgemagnets/fridgemagnets_reg.rsc) \ - $$regResourceDir(qtbase/examples/widgets/softkeys/softkeys_reg.rsc) \ - $$regResourceDir(qtbase/examples/embedded/raycasting/raycasting_reg.rsc) \ - $$regResourceDir(qtbase/examples/embedded/flickable/flickable_reg.rsc) \ - $$regResourceDir(qtbase/examples/embedded/digiflip/digiflip_reg.rsc) \ - $$regResourceDir(qtbase/examples/embedded/lightmaps/lightmaps_reg.rsc) \ - $$regResourceDir(qtbase/examples/embedded/flightinfo/flightinfo_reg.rsc) - - contains(QT_CONFIG, phonon) { - reg_resource.files += $$regResourceDir(qtphonon/examples/qmediaplayer/qmediaplayer_reg.rsc) - } - - contains(QT_CONFIG, multimedia) { - reg_resource.files += $$regResourceDir(qtmultimedia/examples/spectrum/app/spectrum_reg.rsc) - } - - - reg_resource.path = $$REG_RESOURCE_IMPORT_DIR - - resource.files = \ - $$appResourceDir(qtbase/examples/embedded/styledemo/styledemo.rsc) \ - $$appResourceDir(qtbase/examples/painting/deform/deform.rsc) \ - $$appResourceDir(qtbase/examples/painting/pathstroke/pathstroke.rsc) \ - $$appResourceDir(qtbase/examples/widgets/wiggly/wiggly.rsc) \ - $$appResourceDir(qtbase/examples/network/qftp/qftp.rsc)\ - $$appResourceDir(qtbase/examples/xml/saxbookmarks/saxbookmarks.rsc) \ - $$appResourceDir(qtsvg/examples/embedded/desktopservices/desktopservices.rsc) \ - $$appResourceDir(qtbase/examples/draganddrop/fridgemagnets/fridgemagnets.rsc) \ - $$appResourceDir(qtbase/examples/widgets/softkeys/softkeys.rsc) \ - $$appResourceDir(qtbase/examples/embedded/raycasting/raycasting.rsc) \ - $$appResourceDir(qtbase/examples/embedded/flickable/flickable.rsc) \ - $$appResourceDir(qtbase/examples/embedded/digiflip/digiflip.rsc) \ - $$appResourceDir(qtbase/examples/embedded/lightmaps/lightmaps.rsc) \ - $$appResourceDir(qtbase/examples/embedded/flightinfo/flightinfo.rsc) - - - resource.path = $$APP_RESOURCE_DIR - - mifs.files = \ - $$appResourceDir(qtsvg/examples/embedded/fluidlauncher/fluidlauncher.mif) \ - $$appResourceDir(qtbase/examples/embedded/styledemo/styledemo.mif) \ - $$appResourceDir(qtbase/examples/painting/deform/deform.mif) \ - $$appResourceDir(qtbase/examples/painting/pathstroke/pathstroke.mif) \ - $$appResourceDir(qtbase/examples/widgets/wiggly/wiggly.mif) \ - $$appResourceDir(qtbase/examples/network/qftp/qftp.mif) \ - $$appResourceDir(qtbase/examples/xml/saxbookmarks/saxbookmarks.mif) \ - $$appResourceDir(qtsvg/examples/embedded/desktopservices/desktopservices.mif) \ - $$appResourceDir(qtbase/examples/draganddrop/fridgemagnets/fridgemagnets.mif) \ - $$appResourceDir(qtbase/examples/widgets/softkeys/softkeys.mif) \ - $$appResourceDir(qtbase/examples/embedded/raycasting/raycasting.mif) \ - $$appResourceDir(qtbase/examples/embedded/flickable/flickable.mif) \ - $$appResourceDir(qtbase/examples/embedded/digiflip/digiflip.mif) \ - $$appResourceDir(qtbase/examples/embedded/lightmaps/lightmaps.mif) \ - $$appResourceDir(qtbase/examples/embedded/flightinfo/flightinfo.mif) - mifs.path = $$APP_RESOURCE_DIR - - contains(QT_CONFIG, svg) { - executables.files += \ - $$QT_BUILD_TREE/qtsvg/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.exe \ - $$QT_BUILD_TREE/qtsvg/examples/embedded/weatherinfo/weatherinfo.exe - - reg_resource.files += \ - $$regResourceDir(qtsvg/examples/embedded/embeddedsvgviewer/embeddedsvgviewer_reg.rsc) \ - $$regResourceDir(qtsvg/examples/embedded/weatherinfo/weatherinfo_reg.rsc) - - resource.files += \ - $$appResourceDir(qtsvg/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.rsc) \ - $$appResourceDir(qtsvg/examples/embedded/weatherinfo/weatherinfo.rsc) - - mifs.files += \ - $$appResourceDir(qtsvg/examples/embedded/embeddedsvgviewer/embeddedsvgviewer.mif) \ - $$appResourceDir(qtsvg/examples/embedded/weatherinfo/weatherinfo.mif) - - } - contains(QT_CONFIG, webkit) { - executables.files += $$QT_BUILD_TREE/qtwebkit-examples-and-demos/examples/embedded/anomaly/anomaly.exe - reg_resource.files += $$regResourceDir(qtwebkit-examples-and-demos/examples/embedded/anomaly/anomaly_reg.rsc) - resource.files += $$appResourceDir(qtwebkit-examples-and-demos/examples/embedded/anomaly/anomaly.rsc) - mifs.files += \ - $$appResourceDir(qtwebkit-examples-and-demos/examples/embedded/anomaly/anomaly.mif) - - isEmpty(QT_LIBINFIX) { - # Since Fluidlauncher itself doesn't link webkit, we won't get dependency automatically - executables.pkg_prerules += \ - "; Dependency to Qt Webkit" \ - "(0x200267C2), $${QT_MAJOR_VERSION}, $${QT_MINOR_VERSION}, $${QT_PATCH_VERSION}, {\"QtWebKit\"}" - } - } - - contains(QT_CONFIG, phonon) { - executables.files += $$QT_BUILD_TREE/qtphonon/examples/qmediaplayer/qmediaplayer.exe - resource.files += $$appResourceDir(qtphonon/examples/qmediaplayer/qmediaplayer.rsc) - mifs.files += \ - $$appResourceDir(qtphonon/examples/qmediaplayer/qmediaplayer.mif) - } - - contains(QT_CONFIG, multimedia) { - executables.files += $$QT_BUILD_TREE/qtmultimedia/examples/spectrum/app/spectrum.exe - executables.files += $$QT_BUILD_TREE/qtmultimedia/examples/spectrum/3rdparty/fftreal/fftreal.dll - resource.files += $$appResourceDir(qtmultimedia/examples/spectrum/app/spectrum.rsc) - mifs.files += \ - $$appResourceDir(qtmultimedia/examples/spectrum/app/spectrum.mif) - } - - contains(QT_CONFIG, script) { - executables.files += $$QT_BUILD_TREE/qtscript/examples/script/context2d/context2d.exe - reg_resource.files += $$regResourceDir(qtscript/examples/script/context2d/context2d_reg.rsc) - resource.files += $$appResourceDir(qtscript/examples/script/context2d/context2d.rsc) - mifs.files += \ - $$appResourceDir(qtscript/examples/script/context2d/context2d.mif) - } - - qmldemos = qmlcalculator qmlclocks qmldialcontrol qmleasing qmlflickr qmlphotoviewer qmltwitter - contains(QT_CONFIG, declarative) { - for(qmldemo, qmldemos) { - executables.files += $$QT_BUILD_TREE/qtdeclarative/examples/embedded/$${qmldemo}/$${qmldemo}.exe - reg_resource.files += $$regResourceDir(qtdeclarative/examples/embedded/$${qmldemo}/$${qmldemo}_reg.rsc) - resource.files += $$appResourceDir(qtdeclarative/examples/embedded/$${qmldemo}/$${qmldemo}.rsc) - mifs.files += $$appResourceDir(qtdeclarative/examples/embedded/$${qmldemo}/$${qmldemo}.mif) - } - } - - files.files = $$PWD/screenshots $$PWD/slides - files.path = . - - config.files = $$PWD/config_s60/config.xml - config.path = . - - viewerimages.files = $$PWD/../embeddedsvgviewer/shapes.svg - viewerimages.path = /data/images/qt/demos/embeddedsvgviewer - - # demos/mediaplayer make also use of these files. - desktopservices_music.files = \ - $$PWD/../desktopservices/data/*.mp3 \ - $$PWD/../desktopservices/data/*.wav - desktopservices_music.path = /data/sounds - - desktopservices_images.files = $$PWD/../desktopservices/data/*.png - desktopservices_images.path = /data/images - - saxbookmarks.files = $$QT_BUILD_TREE/examples/xml/saxbookmarks/frank.xbel - saxbookmarks.files += $$QT_BUILD_TREE/examples/xml/saxbookmarks/jennifer.xbel - saxbookmarks.path = /data/qt/saxbookmarks - - fluidbackup.files = backup_registration.xml - fluidbackup.path = /private/$$replace(TARGET.UID3, 0x,) - - DEPLOYMENT += config files executables viewerimages saxbookmarks reg_resource resource \ - mifs desktopservices_music desktopservices_images fluidbackup - - contains(QT_CONFIG, declarative):for(qmldemo, qmldemos):include($$QT_BUILD_TREE/qtdeclarative/examples/embedded/$${qmldemo}/deployment.pri) - - DEPLOYMENT.installer_header = 0xA000D7CD - - TARGET.EPOCHEAPSIZE = 100000 20000000 -} diff --git a/examples/embedded/weatherinfo/weatherinfo.cpp b/examples/embedded/weatherinfo/weatherinfo.cpp index 86af1ee..89fc8ab 100644 --- a/examples/embedded/weatherinfo/weatherinfo.cpp +++ b/examples/embedded/weatherinfo/weatherinfo.cpp @@ -89,9 +89,6 @@ public: QAction *action = new QAction(cities[i], this); connect(action, SIGNAL(triggered()), SLOT(chooseCity())); addAction(action); -#if defined(Q_OS_SYMBIAN) - menuBar()->addAction(action); -#endif } setContextMenuPolicy(Qt::ActionsContextMenu); @@ -492,12 +489,8 @@ int main(int argc, char *argv[]) QApplication app(argc, argv); WeatherInfo w; -#if defined(Q_OS_SYMBIAN) - w.showMaximized(); -#else w.resize(520, 288); w.show(); -#endif return app.exec(); } diff --git a/examples/embedded/weatherinfo/weatherinfo.pro b/examples/embedded/weatherinfo/weatherinfo.pro index a596191..4ff9a73 100644 --- a/examples/embedded/weatherinfo/weatherinfo.pro +++ b/examples/embedded/weatherinfo/weatherinfo.pro @@ -4,12 +4,6 @@ SOURCES = weatherinfo.cpp RESOURCES = weatherinfo.qrc QT += network svg -symbian { - TARGET.UID3 = 0xA000CF77 - CONFIG += qt_demo - TARGET.CAPABILITY = NetworkServices -} - target.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/embedded/weatherinfo diff --git a/examples/network/bearercloud/bearercloud.pro b/examples/network/bearercloud/bearercloud.pro index a4f2657..5c41e41 100644 --- a/examples/network/bearercloud/bearercloud.pro +++ b/examples/network/bearercloud/bearercloud.pro @@ -13,11 +13,4 @@ QT = core gui network svg CONFIG += console -symbian: { - TARGET.CAPABILITY = NetworkServices ReadUserData - CONFIG += qt_example -} -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) QT+=widgets diff --git a/examples/network/bearercloud/cloud.cpp b/examples/network/bearercloud/cloud.cpp index 804db44..1c7d00b 100644 --- a/examples/network/bearercloud/cloud.cpp +++ b/examples/network/bearercloud/cloud.cpp @@ -245,8 +245,7 @@ void Cloud::stateChanged(QNetworkSession::State state) else finalOpacity = 1.0; -#if !defined(Q_WS_MAEMO_5) && !defined(Q_WS_MAEMO_6) && \ - !defined(Q_OS_SYMBIAN) && !defined(Q_OS_WINCE) +#if !defined(Q_OS_WINCE) QString tooltip; if (configuration.name().isEmpty()) diff --git a/examples/network/bearercloud/main.cpp b/examples/network/bearercloud/main.cpp index 46525a9..6df099c 100644 --- a/examples/network/bearercloud/main.cpp +++ b/examples/network/bearercloud/main.cpp @@ -67,7 +67,7 @@ CloudView::CloudView(QGraphicsScene *scene) { setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing | QPainter::SmoothPixmapTransform); -#if defined (Q_OS_SYMBIAN) || defined (Q_OS_WINCE) +#if defined (Q_OS_WINCE) setWindowState(Qt::WindowMaximized); #endif } diff --git a/examples/painting/svggenerator/main.cpp b/examples/painting/svggenerator/main.cpp index f7b3967..dcbf1c0 100644 --- a/examples/painting/svggenerator/main.cpp +++ b/examples/painting/svggenerator/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/svggenerator/svggenerator.pro b/examples/painting/svggenerator/svggenerator.pro index 581db0b..4e62b22 100644 --- a/examples/painting/svggenerator/svggenerator.pro +++ b/examples/painting/svggenerator/svggenerator.pro @@ -16,10 +16,4 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS svggenerator.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/painting/svggenerator INSTALLS += target sources -symbian { - TARGET.UID3 = 0xA000CF68 - CONFIG += qt_example -} -maemo5: CONFIG += qt_example - QT+=widgets diff --git a/examples/painting/svggenerator/window.cpp b/examples/painting/svggenerator/window.cpp index 2272422..246e6b6 100644 --- a/examples/painting/svggenerator/window.cpp +++ b/examples/painting/svggenerator/window.cpp @@ -49,10 +49,6 @@ Window::Window(QWidget *parent) : QWidget(parent) { setupUi(this); - -#if defined(Q_OS_SYMBIAN) || defined(Q_WS_MAEMO_5) - this->layout()->setSizeConstraint(QLayout::SetDefaultConstraint); -#endif } void Window::updateBackground(int background) diff --git a/examples/painting/svgviewer/main.cpp b/examples/painting/svgviewer/main.cpp index 1d0f572..5a2ca4b 100644 --- a/examples/painting/svgviewer/main.cpp +++ b/examples/painting/svgviewer/main.cpp @@ -57,10 +57,6 @@ int main(int argc, char **argv) window.openFile(argv[1]); else window.openFile(":/files/bubbles.svg"); -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/painting/svgviewer/svgviewer.pro b/examples/painting/svgviewer/svgviewer.pro index b0bc1ed..94daed9 100644 --- a/examples/painting/svgviewer/svgviewer.pro +++ b/examples/painting/svgviewer/svgviewer.pro @@ -22,13 +22,4 @@ wince*: { DEPLOYMENT += addFiles } -symbian: { - TARGET.UID3 = 0xA000A64E - CONFIG += qt_example - addFiles.files = files\\*.svg - addFiles.path = . - DEPLOYMENT += addFiles -} -maemo5: CONFIG += qt_example - QT+=widgets diff --git a/examples/richtext/textobject/main.cpp b/examples/richtext/textobject/main.cpp index cfe372f..e906ca6 100644 --- a/examples/richtext/textobject/main.cpp +++ b/examples/richtext/textobject/main.cpp @@ -47,10 +47,6 @@ int main(int argv, char **args) QApplication app(argv, args); Window window; -#if defined(Q_OS_SYMBIAN) - window.showMaximized(); -#else window.show(); -#endif return app.exec(); } diff --git a/examples/richtext/textobject/textobject.pro b/examples/richtext/textobject/textobject.pro index e2e7d3b..41a8637 100644 --- a/examples/richtext/textobject/textobject.pro +++ b/examples/richtext/textobject/textobject.pro @@ -14,8 +14,6 @@ sources.files = $$SOURCES $$HEADERS *.pro sources.path = $$[QT_INSTALL_EXAMPLES]/qtsvg/richtext/textobject INSTALLS += target sources -symbian: CONFIG += qt_example -maemo5: CONFIG += qt_example filesToDeploy.files = files/*.svg filesToDeploy.path = files DEPLOYMENT += filesToDeploy diff --git a/src/plugins/imageformats/svg/svg.pro b/src/plugins/imageformats/svg/svg.pro index b687f17..31f6925 100644 --- a/src/plugins/imageformats/svg/svg.pro +++ b/src/plugins/imageformats/svg/svg.pro @@ -11,5 +11,3 @@ QT += xml svg DESTDIR = $$QT.svg.plugins/imageformats target.path += $$[QT_INSTALL_PLUGINS]/imageformats INSTALLS += target - -symbian:TARGET.UID3=0x2001E618 -- cgit v1.2.1