From 965cdb2f87e5d22950a7cd5434e2d80a2fbe6cf9 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Thu, 10 Mar 2016 15:48:31 +0100 Subject: Remove Windows CE. Remove #ifdef sections for Q_OS_WINCE, wince .pro file clauses and Windows CE-specific files. Task-number: QTBUG-51673 Change-Id: I07ea3a9522d5b6bd8cce6f5256d92e65a699e3f5 Reviewed-by: Andy Shaw --- .../embedded/desktopservices/desktopservices.pro | 7 ----- .../embedded/fluidlauncher/config_wince/config.xml | 13 -------- .../svg/embedded/fluidlauncher/fluidlauncher.pro | 35 ---------------------- .../svg/embeddedsvgviewer/embeddedsvgviewer.pro | 5 ---- examples/svg/network/bearercloud/cloud.cpp | 4 --- examples/svg/network/bearercloud/main.cpp | 8 ----- examples/svg/svgviewer/svgviewer.pro | 6 ---- 7 files changed, 78 deletions(-) delete mode 100644 examples/svg/embedded/fluidlauncher/config_wince/config.xml (limited to 'examples/svg') diff --git a/examples/svg/embedded/desktopservices/desktopservices.pro b/examples/svg/embedded/desktopservices/desktopservices.pro index 1410451..0ffcec5 100644 --- a/examples/svg/embedded/desktopservices/desktopservices.pro +++ b/examples/svg/embedded/desktopservices/desktopservices.pro @@ -11,11 +11,4 @@ music.files = data/*.mp3 data/*.wav image.files = data/*.png target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/desktopservices - -wince*{ - music.path = "\\My Documents\\My Music" - image.path = "\\My Documents\\My Pictures" - DEPLOYMENT += music image -} - INSTALLS += target diff --git a/examples/svg/embedded/fluidlauncher/config_wince/config.xml b/examples/svg/embedded/fluidlauncher/config_wince/config.xml deleted file mode 100644 index 3b57770..0000000 --- a/examples/svg/embedded/fluidlauncher/config_wince/config.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - diff --git a/examples/svg/embedded/fluidlauncher/fluidlauncher.pro b/examples/svg/embedded/fluidlauncher/fluidlauncher.pro index 4046055..63cf1fa 100644 --- a/examples/svg/embedded/fluidlauncher/fluidlauncher.pro +++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.pro @@ -19,38 +19,3 @@ RESOURCES = fluidlauncher.qrc target.path = $$[QT_INSTALL_EXAMPLES]/svg/embedded/fluidlauncher INSTALLS += target - -wince*{ - QT += svg - - BUILD_DIR = release - if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { - BUILD_DIR = debug - } - - requires(!isEmpty(_QMAKE_SUPER_CACHE_)) - base = $$dirname(_QMAKE_SUPER_CACHE_) - baseex = $$base/qtbase/examples - svgex = $$base/qtsvg/examples - executables.files = \ - $$svgex/svg/embedded/embeddedsvgviewer/$${BUILD_DIR}/embeddedsvgviewer.exe \ - $$baseex/embedded/styleexample/$${BUILD_DIR}/styleexample.exe \ - $$baseex/painting/deform/$${BUILD_DIR}/deform.exe \ - $$baseex/painting/pathstroke/$${BUILD_DIR}/pathstroke.exe \ - $$baseex/graphicsview/elasticnodes/$${BUILD_DIR}/elasticnodes.exe \ - $$baseex/widgets/wiggly/$${BUILD_DIR}/wiggly.exe \ - $$baseex/painting/concentriccircles/$${BUILD_DIR}/concentriccircles.exe \ - $$baseex/draganddrop/$${BUILD_DIR}/fridgemagnets.exe - - executables.path = . - - files.files = $$PWD/screenshots $$PWD/slides $$PWD/../embeddedsvgviewer/shapes.svg - files.path = . - - config.files = $$PWD/config_wince/config.xml - config.path = . - - DEPLOYMENT += config files executables - - DEPLOYMENT_PLUGIN += qgif qjpeg qmng qsvg -} diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro index 40d4a6c..a0d6793 100644 --- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro +++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.pro @@ -7,8 +7,3 @@ RESOURCES += embeddedsvgviewer.qrc target.path = $$[QT_INSTALL_EXAMPLES]/svg/embeddedsvgviewer INSTALLS += target - -wince* { - DEPLOYMENT_PLUGIN += qsvg -} - diff --git a/examples/svg/network/bearercloud/cloud.cpp b/examples/svg/network/bearercloud/cloud.cpp index be6797f..936c03a 100644 --- a/examples/svg/network/bearercloud/cloud.cpp +++ b/examples/svg/network/bearercloud/cloud.cpp @@ -245,7 +245,6 @@ void Cloud::stateChanged(QNetworkSession::State state) else finalOpacity = 1.0; -#if !defined(Q_OS_WINCE) QString tooltip; if (configuration.name().isEmpty()) @@ -303,9 +302,6 @@ void Cloud::stateChanged(QNetworkSession::State state) tooltip += tr("
Sent data: %1 bytes").arg(session->bytesWritten()); setToolTip(tooltip); -#else - Q_UNUSED(state); -#endif } //! [2] diff --git a/examples/svg/network/bearercloud/main.cpp b/examples/svg/network/bearercloud/main.cpp index 62b6e88..a06b4ea 100644 --- a/examples/svg/network/bearercloud/main.cpp +++ b/examples/svg/network/bearercloud/main.cpp @@ -55,11 +55,6 @@ protected: void resizeEvent(QResizeEvent *) { fitInView(sceneRect(), Qt::KeepAspectRatio); } -#ifdef Q_OS_WINCE - void hideEvent(QHideEvent *) { - qApp->quit(); - } -#endif }; CloudView::CloudView(QGraphicsScene *scene) @@ -67,9 +62,6 @@ CloudView::CloudView(QGraphicsScene *scene) { setRenderHints(QPainter::TextAntialiasing | QPainter::Antialiasing | QPainter::SmoothPixmapTransform); -#if defined (Q_OS_WINCE) - setWindowState(Qt::WindowMaximized); -#endif } #include "main.moc" diff --git a/examples/svg/svgviewer/svgviewer.pro b/examples/svg/svgviewer/svgviewer.pro index 157af4d..1b4764c 100644 --- a/examples/svg/svgviewer/svgviewer.pro +++ b/examples/svg/svgviewer/svgviewer.pro @@ -13,9 +13,3 @@ CONFIG += console # install target.path = $$[QT_INSTALL_EXAMPLES]/svg/svgviewer INSTALLS += target - -wince*: { - addFiles.files = files\\*.svg - addFiles.path = "\\My Documents" - DEPLOYMENT += addFiles -} -- cgit v1.2.1