diff options
| -rw-r--r-- | examples/embedded/embedded.pro | 2 | ||||
| -rw-r--r-- | examples/network/multistreamserver/multistreamserver.pro | 6 | ||||
| -rw-r--r-- | examples/opengl/opengl.pro | 14 | ||||
| -rw-r--r-- | examples/qtconcurrent/qtconcurrent.pro | 4 | ||||
| -rw-r--r-- | examples/sql/books/books.pro | 8 | ||||
| -rw-r--r-- | examples/sql/sql.pro | 12 | ||||
| -rw-r--r-- | examples/widgets/dialogs/configdialog/configdialog.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/dialogs/dialogs.pro | 10 | ||||
| -rw-r--r-- | examples/widgets/dialogs/standarddialogs/standarddialogs.pro | 2 | ||||
| -rw-r--r-- | examples/widgets/dialogs/tabdialog/tabdialog.pro | 2 | ||||
| -rw-r--r-- | examples/xml/dombookmarks/dombookmarks.pro | 7 | ||||
| -rw-r--r-- | examples/xml/htmlinfo/htmlinfo.pro | 6 | ||||
| -rw-r--r-- | examples/xml/saxbookmarks/saxbookmarks.pro | 6 |
13 files changed, 16 insertions, 65 deletions
diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro index 90ee504adf..e772eb88aa 100644 --- a/examples/embedded/embedded.pro +++ b/examples/embedded/embedded.pro @@ -1,4 +1,4 @@ -requires(if(wince|embedded|x11):qtHaveModule(gui)) +requires(if(embedded|x11):qtHaveModule(gui)) TEMPLATE = subdirs SUBDIRS = styleexample raycasting flickable digiflip diff --git a/examples/network/multistreamserver/multistreamserver.pro b/examples/network/multistreamserver/multistreamserver.pro index 75a7e6bbec..38301e122e 100644 --- a/examples/network/multistreamserver/multistreamserver.pro +++ b/examples/network/multistreamserver/multistreamserver.pro @@ -16,9 +16,3 @@ EXAMPLE_FILES = animation.gif # install target.path = $$[QT_INSTALL_EXAMPLES]/network/multistreamserver INSTALLS += target - -wince*: { - addFiles.files += *.gif - addFiles.path = . - DEPLOYMENT += addFiles -} diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index ef44201494..89b3e1d86e 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -8,14 +8,12 @@ qtHaveModule(widgets) { SUBDIRS += contextinfo \ threadedqopenglwidget \ 2dpainting \ - hellogl2 - - !wince: SUBDIRS += \ - qopenglwidget \ - cube \ - textures \ - hellogles3 \ - computegles31 + hellogl2 \ + qopenglwidget \ + cube \ + textures \ + hellogles3 \ + computegles31 } EXAMPLE_FILES += \ diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro index 6e4e5f0f16..bdf41b03ea 100644 --- a/examples/qtconcurrent/qtconcurrent.pro +++ b/examples/qtconcurrent/qtconcurrent.pro @@ -3,12 +3,10 @@ requires(qtHaveModule(concurrent)) TEMPLATE = subdirs SUBDIRS = imagescaling \ map \ + progressdialog \ runfunction \ wordcount -!wince* { - SUBDIRS += progressdialog -} !qtHaveModule(gui) { SUBDIRS -= \ diff --git a/examples/sql/books/books.pro b/examples/sql/books/books.pro index c64766c29f..2b3d541fe8 100644 --- a/examples/sql/books/books.pro +++ b/examples/sql/books/books.pro @@ -10,11 +10,3 @@ QT += sql widgets widgets target.path = $$[QT_INSTALL_EXAMPLES]/sql/books INSTALLS += target - - -wince { - CONFIG(debug, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*d4.dll - CONFIG(release, debug|release):sqlPlugins.files = $$QT_BUILD_TREE/plugins/sqldrivers/*[^d]4.dll - sqlPlugins.path = sqldrivers - INSTALLS += sqlPlugins -} diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro index 135d05b4e2..a427e10929 100644 --- a/examples/sql/sql.pro +++ b/examples/sql/sql.pro @@ -4,16 +4,14 @@ TEMPLATE = subdirs SUBDIRS = books \ drilldown \ - cachedtable \ - relationaltablemodel \ - sqlwidgetmapper - -!wince:qtHaveModule(xml): SUBDIRS += masterdetail - -!wince: SUBDIRS += \ + cachedtable \ querymodel \ + relationaltablemodel \ + sqlwidgetmapper \ tablemodel +qtHaveModule(xml): SUBDIRS += masterdetail + !cross_compile:{ contains(QT_BUILD_PARTS, tools):{ SUBDIRS += sqlbrowser diff --git a/examples/widgets/dialogs/configdialog/configdialog.pro b/examples/widgets/dialogs/configdialog/configdialog.pro index e99fce13ac..8ba55becad 100644 --- a/examples/widgets/dialogs/configdialog/configdialog.pro +++ b/examples/widgets/dialogs/configdialog/configdialog.pro @@ -10,5 +10,3 @@ RESOURCES += configdialog.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/configdialog INSTALLS += target - -wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/dialogs.pro b/examples/widgets/dialogs/dialogs.pro index 6f19309440..82e814dcb0 100644 --- a/examples/widgets/dialogs/dialogs.pro +++ b/examples/widgets/dialogs/dialogs.pro @@ -3,17 +3,13 @@ QT_FOR_CONFIG += widgets TEMPLATE = subdirs SUBDIRS = classwizard \ configdialog \ + extension \ + findfiles \ + licensewizard \ standarddialogs \ tabdialog \ trivialwizard -!wince { - SUBDIRS += \ - licensewizard \ - extension \ - findfiles -} - !qtHaveModule(printsupport): SUBDIRS -= licensewizard !qtConfig(wizard) { SUBDIRS -= trivialwizard licensewizard classwizard diff --git a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro index 12a814cb69..d2e9e19771 100644 --- a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro +++ b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro @@ -7,5 +7,3 @@ SOURCES = dialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/standarddialogs INSTALLS += target - -wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/widgets/dialogs/tabdialog/tabdialog.pro b/examples/widgets/dialogs/tabdialog/tabdialog.pro index c282505ac1..8a686b4f5c 100644 --- a/examples/widgets/dialogs/tabdialog/tabdialog.pro +++ b/examples/widgets/dialogs/tabdialog/tabdialog.pro @@ -7,5 +7,3 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/tabdialog INSTALLS += target - -wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro index 0ab4f0266d..07004377a0 100644 --- a/examples/xml/dombookmarks/dombookmarks.pro +++ b/examples/xml/dombookmarks/dombookmarks.pro @@ -10,10 +10,3 @@ EXAMPLE_FILES = frank.xbel jennifer.xbel # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks INSTALLS += target - -wince { - addFiles.files = frank.xbel jennifer.xbel - addFiles.path = "\\My Documents" - INSTALLS += addFiles -} - diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro index 8adaa780b8..e106c69b52 100644 --- a/examples/xml/htmlinfo/htmlinfo.pro +++ b/examples/xml/htmlinfo/htmlinfo.pro @@ -6,12 +6,6 @@ RESOURCES = resources.qrc win32: CONFIG += console -wince { - htmlfiles.files = *.html - htmlfiles.path = . - INSTALLS += htmlfiles -} - # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo INSTALLS += target diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro index 96a48ef5d4..d07a6e3fb8 100644 --- a/examples/xml/saxbookmarks/saxbookmarks.pro +++ b/examples/xml/saxbookmarks/saxbookmarks.pro @@ -12,9 +12,3 @@ EXAMPLE_FILES = frank.xbel jennifer.xbel # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks INSTALLS += target - -wince { - addFiles.files = frank.xbel jennifer.xbel - addFiles.path = "\\My Documents" - INSTALLS += addFiles -} |