From 115d4fc8cc1816d70f41c839d7eaa4e24ff86db2 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Tue, 8 Mar 2016 15:51:15 +0100 Subject: QtWidgets: Remove Windows CE. Remove Windows CE-specific files, #ifdef sections for Q_OS_WINCE and wince .pro file clauses in library, examples and tests. Task-number: QTBUG-51673 Change-Id: I102745aaca9d9737f2108fe7618111743d5ae980 Reviewed-by: Marc Mutz --- examples/widgets/draganddrop/draganddrop.pro | 2 -- examples/widgets/draganddrop/puzzle/puzzle.pro | 6 ------ examples/widgets/graphicsview/boxes/boxes.pro | 4 ---- examples/widgets/graphicsview/embeddeddialogs/main.cpp | 4 ---- examples/widgets/itemviews/puzzle/puzzle.pro | 5 ----- examples/widgets/painting/affine/affine.pro | 4 ---- examples/widgets/painting/composition/composition.pro | 4 ---- .../widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro | 7 ------- examples/widgets/widgets/icons/icons.pro | 11 ----------- examples/widgets/widgets/imageviewer/imageviewer.pro | 5 ----- examples/widgets/widgets/movie/movie.pro | 7 ------- 11 files changed, 59 deletions(-) (limited to 'examples/widgets') diff --git a/examples/widgets/draganddrop/draganddrop.pro b/examples/widgets/draganddrop/draganddrop.pro index eb678eecd8..1ecafd33a1 100644 --- a/examples/widgets/draganddrop/draganddrop.pro +++ b/examples/widgets/draganddrop/draganddrop.pro @@ -4,5 +4,3 @@ SUBDIRS = draggableicons \ dropsite \ fridgemagnets \ puzzle - -wince: SUBDIRS -= dropsite diff --git a/examples/widgets/draganddrop/puzzle/puzzle.pro b/examples/widgets/draganddrop/puzzle/puzzle.pro index 404b75187d..97e7206682 100644 --- a/examples/widgets/draganddrop/puzzle/puzzle.pro +++ b/examples/widgets/draganddrop/puzzle/puzzle.pro @@ -14,9 +14,3 @@ QMAKE_PROJECT_NAME = dndpuzzle # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/puzzle INSTALLS += target - -wince { - addFile.files = example.jpg - addFile.path = . - INSTALLS += addFile -} diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro index 38aae1c2c4..14d22537e8 100644 --- a/examples/widgets/graphicsview/boxes/boxes.pro +++ b/examples/widgets/graphicsview/boxes/boxes.pro @@ -24,7 +24,3 @@ RESOURCES += boxes.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/boxes INSTALLS += target - -wince { - DEPLOYMENT_PLUGIN += qjpeg -} diff --git a/examples/widgets/graphicsview/embeddeddialogs/main.cpp b/examples/widgets/graphicsview/embeddeddialogs/main.cpp index dcab0ee3a8..cbd5dd5890 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/main.cpp +++ b/examples/widgets/graphicsview/embeddeddialogs/main.cpp @@ -62,11 +62,7 @@ int main(int argc, char *argv[]) QGraphicsScene scene; scene.setStickyFocus(true); -#ifndef Q_OS_WINCE const int gridSize = 10; -#else - const int gridSize = 5; -#endif for (int y = 0; y < gridSize; ++y) { for (int x = 0; x < gridSize; ++x) { diff --git a/examples/widgets/itemviews/puzzle/puzzle.pro b/examples/widgets/itemviews/puzzle/puzzle.pro index a5379293ff..55f1d7e709 100644 --- a/examples/widgets/itemviews/puzzle/puzzle.pro +++ b/examples/widgets/itemviews/puzzle/puzzle.pro @@ -12,8 +12,3 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/puzzle INSTALLS += target - - -wince* { - DEPLOYMENT_PLUGIN += qjpeg qgif -} diff --git a/examples/widgets/painting/affine/affine.pro b/examples/widgets/painting/affine/affine.pro index be6a83960d..0ad869183c 100644 --- a/examples/widgets/painting/affine/affine.pro +++ b/examples/widgets/painting/affine/affine.pro @@ -16,7 +16,3 @@ RESOURCES += affine.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/affine INSTALLS += target - -wince { - DEPLOYMENT_PLUGIN += qjpeg -} diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro index 3b64714ba2..7d174ca2bc 100644 --- a/examples/widgets/painting/composition/composition.pro +++ b/examples/widgets/painting/composition/composition.pro @@ -15,7 +15,3 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/composition INSTALLS += target - -wince* { - DEPLOYMENT_PLUGIN += qjpeg -} diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro index 93cd950b0b..ae51662341 100644 --- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro +++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro @@ -9,10 +9,3 @@ SOURCES = highlighter.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/syntaxhighlighter INSTALLS += target - - -wince { - addFiles.files = main.cpp mainwindow.cpp - addFiles.path = . - INSTALLS += addFiles -} diff --git a/examples/widgets/widgets/icons/icons.pro b/examples/widgets/widgets/icons/icons.pro index 4ee95592c8..450bdf9f8a 100644 --- a/examples/widgets/widgets/icons/icons.pro +++ b/examples/widgets/widgets/icons/icons.pro @@ -17,14 +17,3 @@ EXAMPLE_FILES = images/* # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/icons INSTALLS += target - - -wince { - imageFiles.files = images/* - wincewm*: { - imageFiles.path = "/My Documents/My Pictures" - } else { - imageFiles.path = images - } - INSTALLS += imageFiles -} diff --git a/examples/widgets/widgets/imageviewer/imageviewer.pro b/examples/widgets/widgets/imageviewer/imageviewer.pro index 2853f1699f..4903a68537 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.pro +++ b/examples/widgets/widgets/imageviewer/imageviewer.pro @@ -8,8 +8,3 @@ SOURCES = imageviewer.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/imageviewer INSTALLS += target - - -wince { - DEPLOYMENT_PLUGIN += qjpeg qgif -} diff --git a/examples/widgets/widgets/movie/movie.pro b/examples/widgets/widgets/movie/movie.pro index 94d86454d8..e3b9b5129c 100644 --- a/examples/widgets/widgets/movie/movie.pro +++ b/examples/widgets/widgets/movie/movie.pro @@ -9,10 +9,3 @@ EXAMPLE_FILES = animation.gif # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/movie INSTALLS += target - - -wince { - addFiles.files += *.gif - addFiles.path = . - INSTALLS += addFiles -} -- cgit v1.2.3