diff options
Diffstat (limited to 'examples')
20 files changed, 31 insertions, 27 deletions
diff --git a/examples/corelib/ipc/ipc.pro b/examples/corelib/ipc/ipc.pro index 5fc3c7457f..987df7afc7 100644 --- a/examples/corelib/ipc/ipc.pro +++ b/examples/corelib/ipc/ipc.pro @@ -3,4 +3,4 @@ requires(qtHaveModule(widgets)) TEMPLATE = subdirs # no QSharedMemory !vxworks:SUBDIRS = sharedmemory -!wince*:qtHaveModule(network): SUBDIRS += localfortuneserver localfortuneclient +!wince:qtHaveModule(network): SUBDIRS += localfortuneserver localfortuneclient diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro index 48358fc33c..f364fabf2d 100644 --- a/examples/network/bearermonitor/bearermonitor.pro +++ b/examples/network/bearermonitor/bearermonitor.pro @@ -12,8 +12,8 @@ FORMS = bearermonitor_240_320.ui \ bearermonitor_640_480.ui \ sessionwidget.ui -win32:!wince*:LIBS += -lws2_32 -wince*:LIBS += -lws2 +win32:!wince: LIBS += -lws2_32 +wince: LIBS += -lws2 CONFIG += console diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 7c055d2a82..cf5329c55d 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -10,7 +10,8 @@ qtHaveModule(widgets) { 2dpainting \ hellogl2 - !wince*: SUBDIRS += qopenglwidget \ - cube \ - textures + !wince: SUBDIRS += \ + qopenglwidget \ + cube \ + textures } diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro index 52c7dd1b0b..da237bd6af 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.pro +++ b/examples/qtconcurrent/imagescaling/imagescaling.pro @@ -6,4 +6,4 @@ HEADERS += imagescaling.h target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling INSTALLS += target -wince*: DEPLOYMENT_PLUGIN += qgif qjpeg +wince: DEPLOYMENT_PLUGIN += qgif qjpeg diff --git a/examples/sql/books/books.pro b/examples/sql/books/books.pro index 31c47ba04f..94f8104414 100644 --- a/examples/sql/books/books.pro +++ b/examples/sql/books/books.pro @@ -12,7 +12,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/books INSTALLS += target -wince*: { +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 diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro index eeed18379e..e7bf3e76d9 100644 --- a/examples/sql/sql.pro +++ b/examples/sql/sql.pro @@ -8,9 +8,9 @@ SUBDIRS = books \ relationaltablemodel \ sqlwidgetmapper -!wince*: SUBDIRS += masterdetail +!wince: SUBDIRS += masterdetail -!wince*: SUBDIRS += \ +!wince: SUBDIRS += \ querymodel \ tablemodel diff --git a/examples/sql/sqlbrowser/sqlbrowser.pro b/examples/sql/sqlbrowser/sqlbrowser.pro index 2983226b8b..539796fe71 100644 --- a/examples/sql/sqlbrowser/sqlbrowser.pro +++ b/examples/sql/sqlbrowser/sqlbrowser.pro @@ -17,6 +17,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlbrowser INSTALLS += target -wince*: { +wince { DEPLOYMENT_PLUGIN += qsqlite } diff --git a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro index ae0e59a12b..44815407d7 100644 --- a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro +++ b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro @@ -7,6 +7,6 @@ QT += sql widgets target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper INSTALLS += target -wince*: DEPLOYMENT_PLUGIN += qsqlite +wince: DEPLOYMENT_PLUGIN += qsqlite diff --git a/examples/widgets/dialogs/dialogs.pro b/examples/widgets/dialogs/dialogs.pro index d30c29778f..7a01e818e0 100644 --- a/examples/widgets/dialogs/dialogs.pro +++ b/examples/widgets/dialogs/dialogs.pro @@ -5,10 +5,13 @@ SUBDIRS = classwizard \ tabdialog \ trivialwizard -!wince*: SUBDIRS += licensewizard \ - extension \ - findfiles +!wince { + SUBDIRS += \ + licensewizard \ + extension \ + findfiles +} !qtHaveModule(printsupport): SUBDIRS -= licensewizard contains(DEFINES, QT_NO_WIZARD): SUBDIRS -= trivialwizard licensewizard classwizard -wince*: SUBDIRS += sipdialog +wince: SUBDIRS += sipdialog diff --git a/examples/widgets/draganddrop/draganddrop.pro b/examples/widgets/draganddrop/draganddrop.pro index 098651d2f6..eb678eecd8 100644 --- a/examples/widgets/draganddrop/draganddrop.pro +++ b/examples/widgets/draganddrop/draganddrop.pro @@ -5,4 +5,4 @@ SUBDIRS = draggableicons \ fridgemagnets \ puzzle -wince*: SUBDIRS -= dropsite +wince: SUBDIRS -= dropsite diff --git a/examples/widgets/draganddrop/puzzle/puzzle.pro b/examples/widgets/draganddrop/puzzle/puzzle.pro index 95008fc29b..67fff21a26 100644 --- a/examples/widgets/draganddrop/puzzle/puzzle.pro +++ b/examples/widgets/draganddrop/puzzle/puzzle.pro @@ -15,7 +15,7 @@ QMAKE_PROJECT_NAME = dndpuzzle target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/puzzle INSTALLS += target -wince*: { +wince { addFile.files = example.jpg addFile.path = . DEPLOYMENT += addFile diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro index 15d26f02f0..38aae1c2c4 100644 --- a/examples/widgets/graphicsview/boxes/boxes.pro +++ b/examples/widgets/graphicsview/boxes/boxes.pro @@ -25,6 +25,6 @@ RESOURCES += boxes.qrc target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/boxes INSTALLS += target -wince*: { +wince { DEPLOYMENT_PLUGIN += qjpeg } diff --git a/examples/widgets/painting/affine/affine.pro b/examples/widgets/painting/affine/affine.pro index 1f2f8df87f..be6a83960d 100644 --- a/examples/widgets/painting/affine/affine.pro +++ b/examples/widgets/painting/affine/affine.pro @@ -17,6 +17,6 @@ RESOURCES += affine.qrc target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/affine INSTALLS += target -wince*: { +wince { DEPLOYMENT_PLUGIN += qjpeg } diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro index 640f36f9b8..19f471b5cf 100644 --- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro +++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro @@ -11,7 +11,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/syntaxhighlighter INSTALLS += target -wince*: { +wince { addFiles.files = main.cpp mainwindow.cpp addFiles.path = . DEPLOYMENT += addFiles diff --git a/examples/widgets/widgets/icons/icons.pro b/examples/widgets/widgets/icons/icons.pro index 51d8b79ba9..21165163aa 100644 --- a/examples/widgets/widgets/icons/icons.pro +++ b/examples/widgets/widgets/icons/icons.pro @@ -17,7 +17,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/icons INSTALLS += target -wince*: { +wince { imageFiles.files = images/* wincewm*: { imageFiles.path = "/My Documents/My Pictures" diff --git a/examples/widgets/widgets/imageviewer/imageviewer.pro b/examples/widgets/widgets/imageviewer/imageviewer.pro index 6c9d4a715a..2853f1699f 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.pro +++ b/examples/widgets/widgets/imageviewer/imageviewer.pro @@ -10,6 +10,6 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/imageviewer INSTALLS += target -wince*: { +wince { DEPLOYMENT_PLUGIN += qjpeg qgif } diff --git a/examples/widgets/widgets/movie/movie.pro b/examples/widgets/widgets/movie/movie.pro index 6d333edfa8..86d85552c2 100644 --- a/examples/widgets/widgets/movie/movie.pro +++ b/examples/widgets/widgets/movie/movie.pro @@ -11,7 +11,7 @@ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/movie INSTALLS += target -wince*: { +wince { addFiles.files += *.gif addFiles.path = . DEPLOYMENT += addFiles diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro index 93a5fb9ac9..baf63fa191 100644 --- a/examples/xml/dombookmarks/dombookmarks.pro +++ b/examples/xml/dombookmarks/dombookmarks.pro @@ -11,7 +11,7 @@ EXAMPLE_FILES = frank.xbel jennifer.xbel target.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks INSTALLS += target -wince*: { +wince { addFiles.files = frank.xbel jennifer.xbel addFiles.path = "\\My Documents" DEPLOYMENT += addFiles diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro index 9e58973db6..c0b82965ee 100644 --- a/examples/xml/htmlinfo/htmlinfo.pro +++ b/examples/xml/htmlinfo/htmlinfo.pro @@ -6,7 +6,7 @@ RESOURCES = resources.qrc win32: CONFIG += console -wince*:{ +wince { htmlfiles.files = *.html htmlfiles.path = . DEPLOYMENT += htmlfiles diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro index 6723b0c6fc..353e1559cc 100644 --- a/examples/xml/saxbookmarks/saxbookmarks.pro +++ b/examples/xml/saxbookmarks/saxbookmarks.pro @@ -13,7 +13,7 @@ EXAMPLE_FILES = frank.xbel jennifer.xbel target.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks INSTALLS += target -wince*: { +wince { addFiles.files = frank.xbel jennifer.xbel addFiles.path = "\\My Documents" DEPLOYMENT += addFiles |