From aeb036ed8715d0c099d3dca87f7def4dbaf8e9b4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 27 Nov 2012 20:40:16 +0100 Subject: centralize and fixup example sources install targets it's confusing for the users if the examples' project files contain code to install their own sources. also, this constitutes an enormous code duplication, and lots of mistakes. consequently, automate it. more or less as a side effect, this also removes the entirely meaningless target installs in subdirs projects. Task-number: QTBUG-28184 Change-Id: I9fc1367a06db9e2c46aeb67d68729a4f67163ef9 Reviewed-by: hjk --- examples/widgets/widgets/analogclock/analogclock.pro | 4 +--- examples/widgets/widgets/applicationicon/applicationicon.pro | 4 +--- examples/widgets/widgets/calculator/calculator.pro | 4 +--- examples/widgets/widgets/calendarwidget/calendarwidget.pro | 4 +--- examples/widgets/widgets/charactermap/charactermap.pro | 4 +--- examples/widgets/widgets/codeeditor/codeeditor.pro | 4 +--- examples/widgets/widgets/digitalclock/digitalclock.pro | 4 +--- examples/widgets/widgets/elidedlabel/elidedlabel.pro | 4 +--- examples/widgets/widgets/groupbox/groupbox.pro | 4 +--- examples/widgets/widgets/icons/icons.pro | 6 +++--- examples/widgets/widgets/imageviewer/imageviewer.pro | 4 +--- examples/widgets/widgets/lineedits/lineedits.pro | 4 +--- examples/widgets/widgets/mousebuttons/mousebuttons.pro | 4 +--- examples/widgets/widgets/movie/movie.pro | 6 +++--- examples/widgets/widgets/orientation/orientation.pro | 4 +--- examples/widgets/widgets/scribble/scribble.pro | 4 +--- examples/widgets/widgets/shapedclock/shapedclock.pro | 4 +--- examples/widgets/widgets/sliders/sliders.pro | 4 +--- examples/widgets/widgets/spinboxes/spinboxes.pro | 4 +--- examples/widgets/widgets/styles/styles.pro | 4 +--- examples/widgets/widgets/stylesheet/stylesheet.pro | 4 +--- examples/widgets/widgets/tablet/tablet.pro | 4 +--- examples/widgets/widgets/tetrix/tetrix.pro | 4 +--- examples/widgets/widgets/tooltips/tooltips.pro | 4 +--- examples/widgets/widgets/validators/validators.pro | 4 +--- examples/widgets/widgets/widgets.pro | 5 ----- examples/widgets/widgets/wiggly/wiggly.pro | 4 +--- examples/widgets/widgets/windowflags/windowflags.pro | 4 +--- 28 files changed, 31 insertions(+), 86 deletions(-) (limited to 'examples/widgets/widgets') diff --git a/examples/widgets/widgets/analogclock/analogclock.pro b/examples/widgets/widgets/analogclock/analogclock.pro index d238849403..300c4f8ab4 100644 --- a/examples/widgets/widgets/analogclock/analogclock.pro +++ b/examples/widgets/widgets/analogclock/analogclock.pro @@ -6,9 +6,7 @@ QMAKE_PROJECT_NAME = widgets_analogclock # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/analogclock -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS analogclock.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/analogclock -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/applicationicon/applicationicon.pro b/examples/widgets/widgets/applicationicon/applicationicon.pro index 7e6cb7b10c..19f8ac28f7 100644 --- a/examples/widgets/widgets/applicationicon/applicationicon.pro +++ b/examples/widgets/widgets/applicationicon/applicationicon.pro @@ -12,6 +12,4 @@ OTHER_FILES += applicationicon.svg \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/applicationicon -sources.files = $$SOURCES $$HEADERS applicationicon.svg applicationicon.png *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/applicationicon -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/widgets/calculator/calculator.pro b/examples/widgets/widgets/calculator/calculator.pro index d9cfe3733f..715d450003 100644 --- a/examples/widgets/widgets/calculator/calculator.pro +++ b/examples/widgets/widgets/calculator/calculator.pro @@ -6,9 +6,7 @@ SOURCES = button.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/calculator -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calculator.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/calculator -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/calendarwidget/calendarwidget.pro b/examples/widgets/widgets/calendarwidget/calendarwidget.pro index 20768295e6..ad586f11f8 100644 --- a/examples/widgets/widgets/calendarwidget/calendarwidget.pro +++ b/examples/widgets/widgets/calendarwidget/calendarwidget.pro @@ -4,8 +4,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/calendarwidget -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendarwidget.pro resources -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/calendarwidget -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/charactermap/charactermap.pro b/examples/widgets/widgets/charactermap/charactermap.pro index 6cb004ebbf..370338bf46 100644 --- a/examples/widgets/widgets/charactermap/charactermap.pro +++ b/examples/widgets/widgets/charactermap/charactermap.pro @@ -6,9 +6,7 @@ SOURCES = characterwidget.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/charactermap -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS charactermap.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/charactermap -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/codeeditor/codeeditor.pro b/examples/widgets/widgets/codeeditor/codeeditor.pro index 89e733351b..5af4e24322 100644 --- a/examples/widgets/widgets/codeeditor/codeeditor.pro +++ b/examples/widgets/widgets/codeeditor/codeeditor.pro @@ -3,9 +3,7 @@ SOURCES = main.cpp \ codeeditor.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/codeeditor -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/codeeditor -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/digitalclock/digitalclock.pro b/examples/widgets/widgets/digitalclock/digitalclock.pro index a6771ee51c..9ded97b48c 100644 --- a/examples/widgets/widgets/digitalclock/digitalclock.pro +++ b/examples/widgets/widgets/digitalclock/digitalclock.pro @@ -4,8 +4,6 @@ SOURCES = digitalclock.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/digitalclock -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS digitalclock.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/digitalclock -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/elidedlabel/elidedlabel.pro b/examples/widgets/widgets/elidedlabel/elidedlabel.pro index 08e16cb7c2..1c135ed9c3 100644 --- a/examples/widgets/widgets/elidedlabel/elidedlabel.pro +++ b/examples/widgets/widgets/elidedlabel/elidedlabel.pro @@ -16,6 +16,4 @@ HEADERS += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/elidedlabel -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/elidedlabel -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/widgets/groupbox/groupbox.pro b/examples/widgets/widgets/groupbox/groupbox.pro index c5069f3627..579f0298c6 100644 --- a/examples/widgets/widgets/groupbox/groupbox.pro +++ b/examples/widgets/widgets/groupbox/groupbox.pro @@ -4,9 +4,7 @@ SOURCES = window.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/groupbox -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS groupbox.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/groupbox -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/icons/icons.pro b/examples/widgets/widgets/icons/icons.pro index 150808b310..4227cedadd 100644 --- a/examples/widgets/widgets/icons/icons.pro +++ b/examples/widgets/widgets/icons/icons.pro @@ -8,11 +8,11 @@ SOURCES = iconpreviewarea.cpp \ main.cpp \ mainwindow.cpp +EXAMPLE_FILES = images/* + # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/icons -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS icons.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/icons -INSTALLS += target sources +INSTALLS += target wince*: { diff --git a/examples/widgets/widgets/imageviewer/imageviewer.pro b/examples/widgets/widgets/imageviewer/imageviewer.pro index ec28f926e1..611848b093 100644 --- a/examples/widgets/widgets/imageviewer/imageviewer.pro +++ b/examples/widgets/widgets/imageviewer/imageviewer.pro @@ -4,9 +4,7 @@ SOURCES = imageviewer.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/imageviewer -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS imageviewer.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/imageviewer -INSTALLS += target sources +INSTALLS += target wince*: { diff --git a/examples/widgets/widgets/lineedits/lineedits.pro b/examples/widgets/widgets/lineedits/lineedits.pro index 4dadabc730..d8ac14102f 100644 --- a/examples/widgets/widgets/lineedits/lineedits.pro +++ b/examples/widgets/widgets/lineedits/lineedits.pro @@ -4,8 +4,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/lineedits -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lineedits.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/lineedits -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/mousebuttons/mousebuttons.pro b/examples/widgets/widgets/mousebuttons/mousebuttons.pro index f339e9b082..99ab9f68ae 100644 --- a/examples/widgets/widgets/mousebuttons/mousebuttons.pro +++ b/examples/widgets/widgets/mousebuttons/mousebuttons.pro @@ -12,7 +12,5 @@ HEADERS += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/mousebuttons -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mousebuttons.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/mousebuttons -INSTALLS += target sources +INSTALLS += target QT += core widgets diff --git a/examples/widgets/widgets/movie/movie.pro b/examples/widgets/widgets/movie/movie.pro index 135d8d33e3..d922423373 100644 --- a/examples/widgets/widgets/movie/movie.pro +++ b/examples/widgets/widgets/movie/movie.pro @@ -2,11 +2,11 @@ HEADERS = movieplayer.h SOURCES = main.cpp \ movieplayer.cpp +EXAMPLE_FILES = animation.gif + # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/movie -sources.files = $$SOURCES $$HEADERS $$RESOURCES movie.pro animation.gif -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/movie -INSTALLS += target sources +INSTALLS += target wince*: { diff --git a/examples/widgets/widgets/orientation/orientation.pro b/examples/widgets/widgets/orientation/orientation.pro index 50cdf79781..47cea596d1 100644 --- a/examples/widgets/widgets/orientation/orientation.pro +++ b/examples/widgets/widgets/orientation/orientation.pro @@ -24,8 +24,6 @@ RESOURCES += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/orientation -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/orientation -INSTALLS += target sources +INSTALLS += target 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 7e910921cb..674dccff7e 100644 --- a/examples/widgets/widgets/scribble/scribble.pro +++ b/examples/widgets/widgets/scribble/scribble.pro @@ -6,9 +6,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/scribble -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS scribble.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/scribble -INSTALLS += target sources +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 bdb8593afb..b5cb9c9076 100644 --- a/examples/widgets/widgets/shapedclock/shapedclock.pro +++ b/examples/widgets/widgets/shapedclock/shapedclock.pro @@ -4,9 +4,7 @@ SOURCES = shapedclock.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/shapedclock -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS shapedclock.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/shapedclock -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/sliders/sliders.pro b/examples/widgets/widgets/sliders/sliders.pro index 510b0e842d..bdc30b896c 100644 --- a/examples/widgets/widgets/sliders/sliders.pro +++ b/examples/widgets/widgets/sliders/sliders.pro @@ -6,9 +6,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/sliders -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sliders.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/sliders -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/spinboxes/spinboxes.pro b/examples/widgets/widgets/spinboxes/spinboxes.pro index 0b5b198cfe..55a028c0a5 100644 --- a/examples/widgets/widgets/spinboxes/spinboxes.pro +++ b/examples/widgets/widgets/spinboxes/spinboxes.pro @@ -4,9 +4,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/spinboxes -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS spinboxes.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/spinboxes -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/styles/styles.pro b/examples/widgets/widgets/styles/styles.pro index b05e832ede..f93175997f 100644 --- a/examples/widgets/widgets/styles/styles.pro +++ b/examples/widgets/widgets/styles/styles.pro @@ -9,9 +9,7 @@ REQUIRES += "contains(styles, windows)" # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/styles -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styles.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/styles -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/stylesheet/stylesheet.pro b/examples/widgets/widgets/stylesheet/stylesheet.pro index 92d5c5ebb2..24590ab3dc 100644 --- a/examples/widgets/widgets/stylesheet/stylesheet.pro +++ b/examples/widgets/widgets/stylesheet/stylesheet.pro @@ -9,9 +9,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/stylesheet -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images layouts qss -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/stylesheet -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/tablet/tablet.pro b/examples/widgets/widgets/tablet/tablet.pro index 97c3e9a8d4..2e74cb847b 100644 --- a/examples/widgets/widgets/tablet/tablet.pro +++ b/examples/widgets/widgets/tablet/tablet.pro @@ -8,9 +8,7 @@ SOURCES = mainwindow.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tablet -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tablet.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tablet -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/tetrix/tetrix.pro b/examples/widgets/widgets/tetrix/tetrix.pro index 759dbb7bc8..5dd5342885 100644 --- a/examples/widgets/widgets/tetrix/tetrix.pro +++ b/examples/widgets/widgets/tetrix/tetrix.pro @@ -8,9 +8,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tetrix -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tetrix.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tetrix -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/tooltips/tooltips.pro b/examples/widgets/widgets/tooltips/tooltips.pro index d226ffff12..7262a1aece 100644 --- a/examples/widgets/widgets/tooltips/tooltips.pro +++ b/examples/widgets/widgets/tooltips/tooltips.pro @@ -7,8 +7,6 @@ RESOURCES = tooltips.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tooltips -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tooltips.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/tooltips -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets/validators/validators.pro b/examples/widgets/widgets/validators/validators.pro index f56aa1e4f4..ed15b8cc42 100644 --- a/examples/widgets/widgets/validators/validators.pro +++ b/examples/widgets/widgets/validators/validators.pro @@ -8,8 +8,6 @@ HEADERS += ledwidget.h localeselector.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/validators -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/validators -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/widgets/widgets.pro b/examples/widgets/widgets/widgets.pro index 92f935454b..de1cc81ea6 100644 --- a/examples/widgets/widgets/widgets.pro +++ b/examples/widgets/widgets/widgets.pro @@ -27,8 +27,3 @@ SUBDIRS = analogclock \ windowflags contains(styles, windows): SUBDIRS += styles - -# install -sources.files = widgets.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets -INSTALLS += sources diff --git a/examples/widgets/widgets/wiggly/wiggly.pro b/examples/widgets/widgets/wiggly/wiggly.pro index 9bdb76e40e..17371603dc 100644 --- a/examples/widgets/widgets/wiggly/wiggly.pro +++ b/examples/widgets/widgets/wiggly/wiggly.pro @@ -8,6 +8,4 @@ SOURCES = wigglywidget.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/wiggly -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS wiggly.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/wiggly -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/widgets/windowflags/windowflags.pro b/examples/widgets/widgets/windowflags/windowflags.pro index a1ea42fd5d..e96344c33d 100644 --- a/examples/widgets/widgets/windowflags/windowflags.pro +++ b/examples/widgets/widgets/windowflags/windowflags.pro @@ -6,9 +6,7 @@ SOURCES = controllerwindow.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/windowflags -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowflags.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/widgets/windowflags -INSTALLS += target sources +INSTALLS += target QT += widgets -- cgit v1.2.3