diff options
author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-12-14 21:13:33 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-17 14:08:17 +0100 |
commit | 2ac3f92296d16432f2ed3af916271d6848547f36 (patch) | |
tree | 33b59b0c32aa6982daba2e6668c8696faddbbc78 /examples/widgets/widgets | |
parent | 6c88c7db638618402db06fb0e57c60a3ed8e1064 (diff) |
clean up example project files, mostly wrt QT+=widgets
move QT+=widgets (and printsupport) statements before the install
statements, and de-duplicate some cases.
also move some TARGET assignments to a more conventional place.
Change-Id: I6140d8611680f66c24490e5894e4eb90cae95635
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'examples/widgets/widgets')
22 files changed, 45 insertions, 48 deletions
diff --git a/examples/widgets/widgets/analogclock/analogclock.pro b/examples/widgets/widgets/analogclock/analogclock.pro index 300c4f8ab4..1c6b736995 100644 --- a/examples/widgets/widgets/analogclock/analogclock.pro +++ b/examples/widgets/widgets/analogclock/analogclock.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = analogclock.h SOURCES = analogclock.cpp \ main.cpp @@ -7,6 +9,3 @@ QMAKE_PROJECT_NAME = widgets_analogclock # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/analogclock INSTALLS += target - -QT += widgets - diff --git a/examples/widgets/widgets/calculator/calculator.pro b/examples/widgets/widgets/calculator/calculator.pro index 715d450003..5ee6928c7d 100644 --- a/examples/widgets/widgets/calculator/calculator.pro +++ b/examples/widgets/widgets/calculator/calculator.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = button.h \ calculator.h SOURCES = button.cpp \ @@ -7,6 +9,3 @@ SOURCES = button.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/calculator INSTALLS += target - -QT += widgets - diff --git a/examples/widgets/widgets/calendarwidget/calendarwidget.pro b/examples/widgets/widgets/calendarwidget/calendarwidget.pro index ad586f11f8..a60f10bf36 100644 --- a/examples/widgets/widgets/calendarwidget/calendarwidget.pro +++ b/examples/widgets/widgets/calendarwidget/calendarwidget.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = window.h SOURCES = main.cpp \ window.cpp @@ -5,5 +7,3 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/calendarwidget INSTALLS += target - -QT += widgets diff --git a/examples/widgets/widgets/charactermap/charactermap.pro b/examples/widgets/widgets/charactermap/charactermap.pro index 370338bf46..e9b6bb7c40 100644 --- a/examples/widgets/widgets/charactermap/charactermap.pro +++ b/examples/widgets/widgets/charactermap/charactermap.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = characterwidget.h \ mainwindow.h SOURCES = characterwidget.cpp \ @@ -8,6 +10,4 @@ SOURCES = characterwidget.cpp \ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/charactermap INSTALLS += target -QT += widgets - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/codeeditor/codeeditor.pro b/examples/widgets/widgets/codeeditor/codeeditor.pro index 5af4e24322..5618160d17 100644 --- a/examples/widgets/widgets/codeeditor/codeeditor.pro +++ b/examples/widgets/widgets/codeeditor/codeeditor.pro @@ -1,9 +1,8 @@ +QT += widgets + HEADERS = codeeditor.h SOURCES = main.cpp \ codeeditor.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/codeeditor INSTALLS += target - -QT += widgets - diff --git a/examples/widgets/widgets/digitalclock/digitalclock.pro b/examples/widgets/widgets/digitalclock/digitalclock.pro index 9ded97b48c..4e4bc0f557 100644 --- a/examples/widgets/widgets/digitalclock/digitalclock.pro +++ b/examples/widgets/widgets/digitalclock/digitalclock.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = digitalclock.h SOURCES = digitalclock.cpp \ main.cpp @@ -5,5 +7,3 @@ SOURCES = digitalclock.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/digitalclock INSTALLS += target - -QT += widgets diff --git a/examples/widgets/widgets/groupbox/groupbox.pro b/examples/widgets/widgets/groupbox/groupbox.pro index 579f0298c6..9167d26d6d 100644 --- a/examples/widgets/widgets/groupbox/groupbox.pro +++ b/examples/widgets/widgets/groupbox/groupbox.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = window.h SOURCES = window.cpp \ main.cpp @@ -6,6 +8,4 @@ SOURCES = window.cpp \ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/groupbox INSTALLS += target -QT += widgets - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/icons/icons.pro b/examples/widgets/widgets/icons/icons.pro index 4227cedadd..7a5256bcac 100644 --- a/examples/widgets/widgets/icons/icons.pro +++ b/examples/widgets/widgets/icons/icons.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = iconpreviewarea.h \ iconsizespinbox.h \ imagedelegate.h \ @@ -24,6 +26,5 @@ wince*: { } DEPLOYMENT += imageFiles } -QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/imageviewer/imageviewer.pro b/examples/widgets/widgets/imageviewer/imageviewer.pro index 611848b093..3378db7fb6 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.pro +++ b/examples/widgets/widgets/imageviewer/imageviewer.pro @@ -1,3 +1,6 @@ +QT += widgets +!isEmpty(QT.printsupport.name): QT += printsupport + HEADERS = imageviewer.h SOURCES = imageviewer.cpp \ main.cpp @@ -10,7 +13,5 @@ INSTALLS += target wince*: { DEPLOYMENT_PLUGIN += qjpeg qgif } -QT += widgets -!isEmpty(QT.printsupport.name): QT += printsupport simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/lineedits/lineedits.pro b/examples/widgets/widgets/lineedits/lineedits.pro index d8ac14102f..0ab994ea11 100644 --- a/examples/widgets/widgets/lineedits/lineedits.pro +++ b/examples/widgets/widgets/lineedits/lineedits.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = window.h SOURCES = main.cpp \ window.cpp @@ -5,5 +7,3 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/lineedits INSTALLS += target - -QT += widgets diff --git a/examples/widgets/widgets/movie/movie.pro b/examples/widgets/widgets/movie/movie.pro index d922423373..109e9f411d 100644 --- a/examples/widgets/widgets/movie/movie.pro +++ b/examples/widgets/widgets/movie/movie.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = movieplayer.h SOURCES = main.cpp \ movieplayer.cpp @@ -15,6 +17,4 @@ wince*: { DEPLOYMENT += addFiles } -QT += widgets - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/scribble/scribble.pro b/examples/widgets/widgets/scribble/scribble.pro index 674dccff7e..8c35ba777f 100644 --- a/examples/widgets/widgets/scribble/scribble.pro +++ b/examples/widgets/widgets/scribble/scribble.pro @@ -1,3 +1,6 @@ +QT += widgets +!isEmpty(QT.printsupport.name): QT += printsupport + HEADERS = mainwindow.h \ scribblearea.h SOURCES = main.cpp \ @@ -7,6 +10,3 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/scribble INSTALLS += target - -QT += widgets -!isEmpty(QT.printsupport.name): QT += printsupport diff --git a/examples/widgets/widgets/shapedclock/shapedclock.pro b/examples/widgets/widgets/shapedclock/shapedclock.pro index b5cb9c9076..0fe7f59765 100644 --- a/examples/widgets/widgets/shapedclock/shapedclock.pro +++ b/examples/widgets/widgets/shapedclock/shapedclock.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = shapedclock.h SOURCES = shapedclock.cpp \ main.cpp @@ -5,6 +7,3 @@ SOURCES = shapedclock.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/shapedclock INSTALLS += target - -QT += widgets - diff --git a/examples/widgets/widgets/sliders/sliders.pro b/examples/widgets/widgets/sliders/sliders.pro index bdc30b896c..6a0e01287d 100644 --- a/examples/widgets/widgets/sliders/sliders.pro +++ b/examples/widgets/widgets/sliders/sliders.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = slidersgroup.h \ window.h SOURCES = main.cpp \ @@ -8,6 +10,4 @@ SOURCES = main.cpp \ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/sliders INSTALLS += target -QT += widgets - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/spinboxes/spinboxes.pro b/examples/widgets/widgets/spinboxes/spinboxes.pro index 55a028c0a5..9638317471 100644 --- a/examples/widgets/widgets/spinboxes/spinboxes.pro +++ b/examples/widgets/widgets/spinboxes/spinboxes.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = window.h SOURCES = main.cpp \ window.cpp @@ -6,6 +8,4 @@ SOURCES = main.cpp \ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/spinboxes INSTALLS += target -QT += widgets - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/styles/styles.pro b/examples/widgets/widgets/styles/styles.pro index f93175997f..598dceef65 100644 --- a/examples/widgets/widgets/styles/styles.pro +++ b/examples/widgets/widgets/styles/styles.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = norwegianwoodstyle.h \ widgetgallery.h SOURCES = main.cpp \ @@ -11,6 +13,4 @@ REQUIRES += "contains(styles, windows)" target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/styles INSTALLS += target -QT += widgets - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/stylesheet/stylesheet.pro b/examples/widgets/widgets/stylesheet/stylesheet.pro index 24590ab3dc..01edb0bbd8 100644 --- a/examples/widgets/widgets/stylesheet/stylesheet.pro +++ b/examples/widgets/widgets/stylesheet/stylesheet.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = mainwindow.h \ stylesheeteditor.h FORMS = mainwindow.ui \ @@ -11,6 +13,4 @@ SOURCES = main.cpp \ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/stylesheet INSTALLS += target -QT += widgets - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/tablet/tablet.pro b/examples/widgets/widgets/tablet/tablet.pro index 2e74cb847b..6867f92ac8 100644 --- a/examples/widgets/widgets/tablet/tablet.pro +++ b/examples/widgets/widgets/tablet/tablet.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = mainwindow.h \ tabletcanvas.h \ tabletapplication.h @@ -10,6 +12,4 @@ SOURCES = mainwindow.cpp \ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tablet INSTALLS += target -QT += widgets - simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/tetrix/tetrix.pro b/examples/widgets/widgets/tetrix/tetrix.pro index 5dd5342885..bb9f855fb0 100644 --- a/examples/widgets/widgets/tetrix/tetrix.pro +++ b/examples/widgets/widgets/tetrix/tetrix.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = tetrixboard.h \ tetrixpiece.h \ tetrixwindow.h @@ -9,6 +11,3 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tetrix INSTALLS += target - -QT += widgets - diff --git a/examples/widgets/widgets/tooltips/tooltips.pro b/examples/widgets/widgets/tooltips/tooltips.pro index 7262a1aece..d14b8295ba 100644 --- a/examples/widgets/widgets/tooltips/tooltips.pro +++ b/examples/widgets/widgets/tooltips/tooltips.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = shapeitem.h \ sortingbox.h SOURCES = main.cpp \ @@ -8,5 +10,3 @@ RESOURCES = tooltips.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tooltips INSTALLS += target - -QT += widgets diff --git a/examples/widgets/widgets/wiggly/wiggly.pro b/examples/widgets/widgets/wiggly/wiggly.pro index 17371603dc..0e39f18add 100644 --- a/examples/widgets/widgets/wiggly/wiggly.pro +++ b/examples/widgets/widgets/wiggly/wiggly.pro @@ -1,4 +1,4 @@ -QT += widgets widgets +QT += widgets HEADERS = wigglywidget.h \ dialog.h diff --git a/examples/widgets/widgets/windowflags/windowflags.pro b/examples/widgets/widgets/windowflags/windowflags.pro index e96344c33d..250319983a 100644 --- a/examples/widgets/widgets/windowflags/windowflags.pro +++ b/examples/widgets/widgets/windowflags/windowflags.pro @@ -1,3 +1,5 @@ +QT += widgets + HEADERS = controllerwindow.h \ previewwindow.h SOURCES = controllerwindow.cpp \ @@ -8,6 +10,4 @@ SOURCES = controllerwindow.cpp \ target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/windowflags INSTALLS += target -QT += widgets - simulator: warning(This example might not fully work on Simulator platform) |