summaryrefslogtreecommitdiffstats
path: root/examples/widgets
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-03 17:04:53 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-06-05 10:29:10 +0000
commitd32f47b70387713335656a8e93f289c819fb9b05 (patch)
tree4ecd3f75a94d77f1068807a6fce058238915c2a4 /examples/widgets
parent92b3397a8914ef6b516a8473888986f838396781 (diff)
fix usage of wince scope
Fix style issues along the way. Change-Id: Ic6a6de28e198eb0b14c198b802e78845703909b9 Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'examples/widgets')
-rw-r--r--examples/widgets/dialogs/dialogs.pro11
-rw-r--r--examples/widgets/draganddrop/draganddrop.pro2
-rw-r--r--examples/widgets/draganddrop/puzzle/puzzle.pro2
-rw-r--r--examples/widgets/graphicsview/boxes/boxes.pro2
-rw-r--r--examples/widgets/painting/affine/affine.pro2
-rw-r--r--examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro2
-rw-r--r--examples/widgets/widgets/icons/icons.pro2
-rw-r--r--examples/widgets/widgets/imageviewer/imageviewer.pro2
-rw-r--r--examples/widgets/widgets/movie/movie.pro2
9 files changed, 15 insertions, 12 deletions
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