diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-27 20:40:16 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-29 20:21:11 +0100 |
| commit | aeb036ed8715d0c099d3dca87f7def4dbaf8e9b4 (patch) | |
| tree | 95a679c8b456c61bc108e1a68b0aced288313df6 | |
| parent | 12dcab77a7248268c58c2c5431c2c237e14d1089 (diff) | |
306 files changed, 367 insertions, 1050 deletions
diff --git a/examples/dbus/chat/chat.pro b/examples/dbus/chat/chat.pro index 5c78405804..17947e099f 100644 --- a/examples/dbus/chat/chat.pro +++ b/examples/dbus/chat/chat.pro @@ -9,8 +9,6 @@ DBUS_INTERFACES += org.example.chat.xml # install target.path = $$[QT_INSTALL_EXAMPLES]/dbus/chat -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml -sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/dbus-chat -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/complexpingpong/complexping.pro b/examples/dbus/complexpingpong/complexping.pro index 0f9f37044f..dc9c644fcc 100644 --- a/examples/dbus/complexpingpong/complexping.pro +++ b/examples/dbus/complexpingpong/complexping.pro @@ -5,8 +5,6 @@ HEADERS += complexping.h ping-common.h SOURCES += complexping.cpp target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/complexpingpong/complexpong.pro b/examples/dbus/complexpingpong/complexpong.pro index dede78026a..5816f21784 100644 --- a/examples/dbus/complexpingpong/complexpong.pro +++ b/examples/dbus/complexpingpong/complexpong.pro @@ -5,8 +5,6 @@ HEADERS += complexpong.h SOURCES += complexpong.cpp target.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/complexpingpong -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/dbus.pro b/examples/dbus/dbus.pro index 2b77665518..89d42bf7fe 100644 --- a/examples/dbus/dbus.pro +++ b/examples/dbus/dbus.pro @@ -8,10 +8,4 @@ SUBDIRS = listnames \ remotecontrolledcar } -# install -target.path = $$[QT_INSTALL_EXAMPLES]/dbus -sources.files = *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/dbus -INSTALLS += sources - QT += widgets diff --git a/examples/dbus/listnames/listnames.pro b/examples/dbus/listnames/listnames.pro index 307036c4aa..f1ebe1dee8 100644 --- a/examples/dbus/listnames/listnames.pro +++ b/examples/dbus/listnames/listnames.pro @@ -5,8 +5,6 @@ win32:CONFIG += console SOURCES += listnames.cpp target.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/listnames -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/pingpong/ping.pro b/examples/dbus/pingpong/ping.pro index 448a2b41e4..d753bc69eb 100644 --- a/examples/dbus/pingpong/ping.pro +++ b/examples/dbus/pingpong/ping.pro @@ -5,8 +5,6 @@ HEADERS += ping-common.h SOURCES += ping.cpp target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/pingpong/pong.pro b/examples/dbus/pingpong/pong.pro index 046d6f07b6..57c4fab965 100644 --- a/examples/dbus/pingpong/pong.pro +++ b/examples/dbus/pingpong/pong.pro @@ -5,8 +5,6 @@ HEADERS += ping-common.h pong.h SOURCES += pong.cpp target.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/pingpong -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/remotecontrolledcar/car/car.pro b/examples/dbus/remotecontrolledcar/car/car.pro index e8a4f9e01f..945fb93ae6 100644 --- a/examples/dbus/remotecontrolledcar/car/car.pro +++ b/examples/dbus/remotecontrolledcar/car/car.pro @@ -6,8 +6,6 @@ SOURCES += car.cpp main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.xml -sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/car -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/remotecontrolledcar/controller/controller.pro b/examples/dbus/remotecontrolledcar/controller/controller.pro index d6bbd9c8ee..1d74bb017f 100644 --- a/examples/dbus/remotecontrolledcar/controller/controller.pro +++ b/examples/dbus/remotecontrolledcar/controller/controller.pro @@ -7,8 +7,6 @@ SOURCES += main.cpp controller.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.xml -sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar/controller -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro index 519b9b0157..f5a0c27435 100644 --- a/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro +++ b/examples/dbus/remotecontrolledcar/remotecontrolledcar.pro @@ -2,9 +2,4 @@ TEMPLATE = subdirs SUBDIRS = car \ controller -# install -sources.files = *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/dbus/remotecontrolledcar -INSTALLS += sources - QT += widgets diff --git a/examples/embedded/digiflip/digiflip.pro b/examples/embedded/digiflip/digiflip.pro index dc8ac9abbb..af6c2773c8 100644 --- a/examples/embedded/digiflip/digiflip.pro +++ b/examples/embedded/digiflip/digiflip.pro @@ -3,6 +3,4 @@ QT += widgets SOURCES = digiflip.cpp target.path = $$[QT_INSTALL_EXAMPLES]/embedded/digiflip -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/digiflip -INSTALLS += target sources +INSTALLS += target diff --git a/examples/embedded/embedded.pro b/examples/embedded/embedded.pro index 70b5fa003b..aa01bda368 100644 --- a/examples/embedded/embedded.pro +++ b/examples/embedded/embedded.pro @@ -4,9 +4,4 @@ SUBDIRS = styleexample raycasting flickable digiflip SUBDIRS += lightmaps SUBDIRS += flightinfo -# install -sources.files = README *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/embedded -INSTALLS += sources - QT += widgets widgets diff --git a/examples/embedded/flickable/flickable.pro b/examples/embedded/flickable/flickable.pro index 67886bc207..3bc86c661f 100644 --- a/examples/embedded/flickable/flickable.pro +++ b/examples/embedded/flickable/flickable.pro @@ -2,7 +2,5 @@ SOURCES = flickable.cpp main.cpp HEADERS = flickable.h target.path = $$[QT_INSTALL_EXAMPLES]/embedded/flickable -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/flickable -INSTALLS += target sources +INSTALLS += target QT += widgets widgets diff --git a/examples/embedded/flightinfo/flightinfo.pro b/examples/embedded/flightinfo/flightinfo.pro index 51ae783eb5..4e62b24576 100644 --- a/examples/embedded/flightinfo/flightinfo.pro +++ b/examples/embedded/flightinfo/flightinfo.pro @@ -6,6 +6,4 @@ RESOURCES = flightinfo.qrc QT += network widgets target.path = $$[QT_INSTALL_EXAMPLES]/embedded/flightinfo -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/flightinfo -INSTALLS += target sources +INSTALLS += target diff --git a/examples/embedded/lightmaps/lightmaps.pro b/examples/embedded/lightmaps/lightmaps.pro index 272488a85f..bb75cf0a9c 100644 --- a/examples/embedded/lightmaps/lightmaps.pro +++ b/examples/embedded/lightmaps/lightmaps.pro @@ -9,6 +9,4 @@ SOURCES = lightmaps.cpp \ QT += network widgets target.path = $$[QT_INSTALL_EXAMPLES]/embedded/lightmaps -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/lightmaps -INSTALLS += target sources +INSTALLS += target diff --git a/examples/embedded/raycasting/raycasting.pro b/examples/embedded/raycasting/raycasting.pro index 770e97318d..79b560ffeb 100644 --- a/examples/embedded/raycasting/raycasting.pro +++ b/examples/embedded/raycasting/raycasting.pro @@ -3,7 +3,5 @@ SOURCES = raycasting.cpp RESOURCES += raycasting.qrc target.path = $$[QT_INSTALL_EXAMPLES]/embedded/raycasting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/raycasting -INSTALLS += target sources +INSTALLS += target QT += widgets widgets diff --git a/examples/embedded/styleexample/styleexample.pro b/examples/embedded/styleexample/styleexample.pro index e0e888e555..8f29203df2 100644 --- a/examples/embedded/styleexample/styleexample.pro +++ b/examples/embedded/styleexample/styleexample.pro @@ -6,6 +6,4 @@ SOURCES += main.cpp stylewidget.cpp RESOURCES += styleexample.qrc target.path = $$[QT_INSTALL_EXAMPLES]/embedded/styleexample -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.html -sources.path = $$[QT_INSTALL_EXAMPLES]/embedded/styleexample -INSTALLS += target sources +INSTALLS += target diff --git a/examples/examples.pro b/examples/examples.pro index b48fe03553..7c149ff7ac 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -24,8 +24,3 @@ contains(QT_BUILD_PARTS, tools):!contains(QT_CONFIG, no-gui):!contains(QT_CONFIG contains(QT_CONFIG, opengl):!contains(QT_CONFIG, no-widgets):SUBDIRS += opengl contains(QT_CONFIG, dbus): SUBDIRS += dbus contains(QT_CONFIG, concurrent): SUBDIRS += qtconcurrent - -# install -sources.files = README *.pro -sources.path = $$[QT_INSTALL_EXAMPLES] -INSTALLS += sources diff --git a/examples/gestures/gestures.pro b/examples/gestures/gestures.pro index a0068f9235..678fbc5829 100644 --- a/examples/gestures/gestures.pro +++ b/examples/gestures/gestures.pro @@ -3,9 +3,4 @@ TEMPLATE = \ SUBDIRS = \ imagegestures -# install -target.path = $$[QT_INSTALL_EXAMPLES]/gestures -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS gestures.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/gestures -INSTALLS += target sources QT += widgets diff --git a/examples/gestures/imagegestures/imagegestures.pro b/examples/gestures/imagegestures/imagegestures.pro index 8b5c0632ba..7844cc2ea1 100644 --- a/examples/gestures/imagegestures/imagegestures.pro +++ b/examples/gestures/imagegestures/imagegestures.pro @@ -6,14 +6,7 @@ SOURCES = imagewidget.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/gestures/imagegestures -sources.files = $$SOURCES \ - $$HEADERS \ - $$RESOURCES \ - $$FORMS \ - imagegestures.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/gestures/imagegestures -INSTALLS += target \ - sources +INSTALLS += target QT += widgets diff --git a/examples/ipc/ipc.pro b/examples/ipc/ipc.pro index c62402e338..ba3990d869 100644 --- a/examples/ipc/ipc.pro +++ b/examples/ipc/ipc.pro @@ -3,9 +3,4 @@ TEMPLATE = subdirs !vxworks:!qnx:SUBDIRS = sharedmemory !wince*: SUBDIRS += localfortuneserver localfortuneclient -# install -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS ipc.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/ipc -INSTALLS += sources - QT += widgets diff --git a/examples/ipc/localfortuneclient/localfortuneclient.pro b/examples/ipc/localfortuneclient/localfortuneclient.pro index 43aa68f183..a029443632 100644 --- a/examples/ipc/localfortuneclient/localfortuneclient.pro +++ b/examples/ipc/localfortuneclient/localfortuneclient.pro @@ -5,9 +5,7 @@ QT += network widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneclient -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneclient.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneclient -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/ipc/localfortuneserver/localfortuneserver.pro b/examples/ipc/localfortuneserver/localfortuneserver.pro index 973535adf0..1da5c40b93 100644 --- a/examples/ipc/localfortuneserver/localfortuneserver.pro +++ b/examples/ipc/localfortuneserver/localfortuneserver.pro @@ -5,9 +5,7 @@ QT += network widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneserver -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS localfortuneserver.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/localfortuneserver -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/ipc/sharedmemory/sharedmemory.pro b/examples/ipc/sharedmemory/sharedmemory.pro index 2bcef9fc0d..f6f2fc3c42 100644 --- a/examples/ipc/sharedmemory/sharedmemory.pro +++ b/examples/ipc/sharedmemory/sharedmemory.pro @@ -6,11 +6,11 @@ HEADERS += dialog.h # Forms and resources FORMS += dialog.ui +EXAMPLE_FILES = *.png + # install target.path = $$[QT_INSTALL_EXAMPLES]/ipc/sharedmemory -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/ipc/sharedmemory -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/ja_JP/linguist/hellotr/hellotr.pro b/examples/ja_JP/linguist/hellotr/hellotr.pro index e6e1442665..e4a1ee11bb 100644 --- a/examples/ja_JP/linguist/hellotr/hellotr.pro +++ b/examples/ja_JP/linguist/hellotr/hellotr.pro @@ -6,8 +6,6 @@ TRANSLATIONS = hellotr_ja.ts # install target.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/linguist/arrowpad/arrowpad.pro b/examples/linguist/arrowpad/arrowpad.pro index c4aab2c2a9..3b5916684b 100644 --- a/examples/linguist/arrowpad/arrowpad.pro +++ b/examples/linguist/arrowpad/arrowpad.pro @@ -11,9 +11,7 @@ TRANSLATIONS = arrowpad_fr.ts \ # install target.path = $$[QT_INSTALL_EXAMPLES]/linguist/arrowpad -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/arrowpad -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/linguist/hellotr/hellotr.pro b/examples/linguist/hellotr/hellotr.pro index cc5a6557b6..38e5a5b366 100644 --- a/examples/linguist/hellotr/hellotr.pro +++ b/examples/linguist/hellotr/hellotr.pro @@ -6,9 +6,7 @@ TRANSLATIONS = hellotr_la.ts # install target.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/hellotr -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/linguist/linguist.pro b/examples/linguist/linguist.pro index 2b199fc54b..6109ef0045 100644 --- a/examples/linguist/linguist.pro +++ b/examples/linguist/linguist.pro @@ -3,9 +3,4 @@ SUBDIRS = arrowpad \ hellotr \ trollprint -# install -sources.files = README *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/linguist -INSTALLS += sources - QT += widgets diff --git a/examples/linguist/trollprint/trollprint.pro b/examples/linguist/trollprint/trollprint.pro index c2300ce55c..f4f60c41cf 100644 --- a/examples/linguist/trollprint/trollprint.pro +++ b/examples/linguist/trollprint/trollprint.pro @@ -7,9 +7,7 @@ TRANSLATIONS = trollprint_pt.ts # install target.path = $$[QT_INSTALL_EXAMPLES]/linguist/trollprint -sources.files = $$SOURCES $$HEADERS $$TRANSLATIONS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/linguist/trollprint -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/network/bearermonitor/bearermonitor.pro b/examples/network/bearermonitor/bearermonitor.pro index 2ec47ee2c7..05584bd582 100644 --- a/examples/network/bearermonitor/bearermonitor.pro +++ b/examples/network/bearermonitor/bearermonitor.pro @@ -12,6 +12,8 @@ FORMS = bearermonitor_240_320.ui \ bearermonitor_640_480.ui \ sessionwidget.ui +EXAMPLE_FILES = bearermonitor_maemo.ui sessionwidget_maemo.ui # not used + win32:!wince*:LIBS += -lws2_32 wince*:LIBS += -lws2 @@ -19,6 +21,4 @@ CONFIG += console # install target.path = $$[QT_INSTALL_EXAMPLES]/network/bearermonitor -sources.files = $$SOURCES $$HEADERS *.ui *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/bearermonitor -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/blockingfortuneclient/blockingfortuneclient.pro b/examples/network/blockingfortuneclient/blockingfortuneclient.pro index bfe4162b2b..bcf5346d35 100644 --- a/examples/network/blockingfortuneclient/blockingfortuneclient.pro +++ b/examples/network/blockingfortuneclient/blockingfortuneclient.pro @@ -9,7 +9,5 @@ QT += network # install target.path = $$[QT_INSTALL_EXAMPLES]/network/blockingfortuneclient -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blockingfortuneclient.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/blockingfortuneclient -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/broadcastreceiver/broadcastreceiver.pro b/examples/network/broadcastreceiver/broadcastreceiver.pro index b77369637b..e1708f36da 100644 --- a/examples/network/broadcastreceiver/broadcastreceiver.pro +++ b/examples/network/broadcastreceiver/broadcastreceiver.pro @@ -7,7 +7,5 @@ QT += network # install target.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastreceiver -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastreceiver.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastreceiver -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/broadcastsender/broadcastsender.pro b/examples/network/broadcastsender/broadcastsender.pro index c8e102b977..611b617471 100644 --- a/examples/network/broadcastsender/broadcastsender.pro +++ b/examples/network/broadcastsender/broadcastsender.pro @@ -7,6 +7,4 @@ QT += network # install target.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastsender -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS broadcastsender.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/broadcastsender -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/dnslookup/dnslookup.pro b/examples/network/dnslookup/dnslookup.pro index 9817080e44..0c6b512d3b 100644 --- a/examples/network/dnslookup/dnslookup.pro +++ b/examples/network/dnslookup/dnslookup.pro @@ -7,6 +7,4 @@ SOURCES += dnslookup.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/network/dnslookup -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/dnslookup -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/download/download.pro b/examples/network/download/download.pro index 8a55139b4c..068eab93ce 100644 --- a/examples/network/download/download.pro +++ b/examples/network/download/download.pro @@ -6,8 +6,6 @@ SOURCES += main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/network/download -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/network/download -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/network/downloadmanager/downloadmanager.pro b/examples/network/downloadmanager/downloadmanager.pro index 45edf70574..4545ae0c0e 100644 --- a/examples/network/downloadmanager/downloadmanager.pro +++ b/examples/network/downloadmanager/downloadmanager.pro @@ -7,9 +7,7 @@ SOURCES += downloadmanager.cpp main.cpp textprogressbar.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/network/downloadmanager -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/network/downloadmanager -INSTALLS += target sources +INSTALLS += target OTHER_FILES += \ debian/changelog \ diff --git a/examples/network/fortuneclient/fortuneclient.pro b/examples/network/fortuneclient/fortuneclient.pro index 3e359f73a4..b921941da3 100644 --- a/examples/network/fortuneclient/fortuneclient.pro +++ b/examples/network/fortuneclient/fortuneclient.pro @@ -7,6 +7,4 @@ QT += network # install target.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneclient -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneclient.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneclient -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/fortuneserver/fortuneserver.pro b/examples/network/fortuneserver/fortuneserver.pro index 25ea93eaf1..cfcf680f81 100644 --- a/examples/network/fortuneserver/fortuneserver.pro +++ b/examples/network/fortuneserver/fortuneserver.pro @@ -7,6 +7,4 @@ QT += network # install target.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fortuneserver.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/fortuneserver -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/googlesuggest/googlesuggest.pro b/examples/network/googlesuggest/googlesuggest.pro index 9cbab551cf..6879369ddc 100644 --- a/examples/network/googlesuggest/googlesuggest.pro +++ b/examples/network/googlesuggest/googlesuggest.pro @@ -4,9 +4,7 @@ HEADERS = searchbox.h googlesuggest.h # install target.path = $$[QT_INSTALL_EXAMPLES]/network/googlesuggest -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/googlesuggest -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/network/http/http.pro b/examples/network/http/http.pro index 640cba9779..1543584cf5 100644 --- a/examples/network/http/http.pro +++ b/examples/network/http/http.pro @@ -8,6 +8,4 @@ QT += network # install target.path = $$[QT_INSTALL_EXAMPLES]/network/http -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS http.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/http -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/loopback/loopback.pro b/examples/network/loopback/loopback.pro index 200ae11902..c7b8d060b8 100644 --- a/examples/network/loopback/loopback.pro +++ b/examples/network/loopback/loopback.pro @@ -7,6 +7,4 @@ QT += network # install target.path = $$[QT_INSTALL_EXAMPLES]/network/loopback -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS loopback.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/loopback -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/multicastreceiver/multicastreceiver.pro b/examples/network/multicastreceiver/multicastreceiver.pro index 49cecb254a..bbba25a626 100644 --- a/examples/network/multicastreceiver/multicastreceiver.pro +++ b/examples/network/multicastreceiver/multicastreceiver.pro @@ -7,7 +7,5 @@ QT += network # install target.path = $$[QT_INSTALL_EXAMPLES]/network/multicastreceiver -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastreceiver.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/multicastreceiver -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/multicastsender/multicastsender.pro b/examples/network/multicastsender/multicastsender.pro index a9e62474d7..4797b194a9 100644 --- a/examples/network/multicastsender/multicastsender.pro +++ b/examples/network/multicastsender/multicastsender.pro @@ -5,7 +5,5 @@ QT += network widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/network/multicastsender -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS multicastsender.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/multicastsender -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/network-chat/network-chat.pro b/examples/network/network-chat/network-chat.pro index 17b31b58ff..b20e8b2934 100644 --- a/examples/network/network-chat/network-chat.pro +++ b/examples/network/network-chat/network-chat.pro @@ -14,8 +14,6 @@ QT += network widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network-chat.pro *.chat -sources.path = $$[QT_INSTALL_EXAMPLES]/network/network-chat -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/network.pro b/examples/network/network.pro index 8d82c8ae87..f473a112f6 100644 --- a/examples/network/network.pro +++ b/examples/network/network.pro @@ -26,9 +26,3 @@ SUBDIRS = \ contains(QT_CONFIG, openssl):SUBDIRS += securesocketclient contains(QT_CONFIG, openssl-linked):SUBDIRS += securesocketclient } - - -# install -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS network.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/network -INSTALLS += sources diff --git a/examples/network/securesocketclient/securesocketclient.pro b/examples/network/securesocketclient/securesocketclient.pro index 3dcecb92ba..f13ed57247 100644 --- a/examples/network/securesocketclient/securesocketclient.pro +++ b/examples/network/securesocketclient/securesocketclient.pro @@ -11,7 +11,5 @@ QT += network widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.jpg images -sources.path = $$[QT_INSTALL_EXAMPLES]/network/securesocketclient -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/threadedfortuneserver/threadedfortuneserver.pro b/examples/network/threadedfortuneserver/threadedfortuneserver.pro index ea0496843c..cb6be41d33 100644 --- a/examples/network/threadedfortuneserver/threadedfortuneserver.pro +++ b/examples/network/threadedfortuneserver/threadedfortuneserver.pro @@ -11,8 +11,6 @@ QT += network # install target.path = $$[QT_INSTALL_EXAMPLES]/network/threadedfortuneserver -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threadedfortuneserver.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/network/threadedfortuneserver -INSTALLS += target sources +INSTALLS += target diff --git a/examples/network/torrent/torrent.pro b/examples/network/torrent/torrent.pro index 118ea02929..a080ec07e2 100644 --- a/examples/network/torrent/torrent.pro +++ b/examples/network/torrent/torrent.pro @@ -33,10 +33,7 @@ QT += network # install target.path = $$[QT_INSTALL_EXAMPLES]/network/torrent -sources.files = $$SOURCES $$HEADERS $$RESOURCES torrent.pro *.torrent -sources.files += icons forms 3rdparty -sources.path = $$[QT_INSTALL_EXAMPLES]/network/torrent -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/2dpainting/2dpainting.pro b/examples/opengl/2dpainting/2dpainting.pro index 0c981ce505..54e9a11f1e 100644 --- a/examples/opengl/2dpainting/2dpainting.pro +++ b/examples/opengl/2dpainting/2dpainting.pro @@ -12,9 +12,7 @@ SOURCES = glwidget.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/2dpainting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2dpainting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/2dpainting -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/cube/cube.pro b/examples/opengl/cube/cube.pro index c904160d90..aaa933c1e2 100644 --- a/examples/opengl/cube/cube.pro +++ b/examples/opengl/cube/cube.pro @@ -18,16 +18,10 @@ contains(QT_CONFIG, opengl) { RESOURCES += \ shaders.qrc \ textures.qrc - - OTHER_FILES += \ - vshader.glsl \ - fshader.glsl } # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/cube -sources.files = $$SOURCES $$HEADERS $$RESOURCES cube.png *.glsl *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/cube -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/framebufferobject2/framebufferobject2.pro b/examples/opengl/framebufferobject2/framebufferobject2.pro index 073981b9f9..d26751ab0e 100644 --- a/examples/opengl/framebufferobject2/framebufferobject2.pro +++ b/examples/opengl/framebufferobject2/framebufferobject2.pro @@ -6,9 +6,7 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2 -sources.files = $$SOURCES $$HEADERS $$RESOURCES framebufferobject2.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/framebufferobject2 -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/grabber/grabber.pro b/examples/opengl/grabber/grabber.pro index 5267ccf012..a60dbbe2dc 100644 --- a/examples/opengl/grabber/grabber.pro +++ b/examples/opengl/grabber/grabber.pro @@ -7,9 +7,7 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS grabber.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/grabber -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/hellogl/hellogl.pro b/examples/opengl/hellogl/hellogl.pro index 33e7c266c8..acaca35635 100644 --- a/examples/opengl/hellogl/hellogl.pro +++ b/examples/opengl/hellogl/hellogl.pro @@ -12,9 +12,7 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/hellogl_es/hellogl_es.pro b/examples/opengl/hellogl_es/hellogl_es.pro index 850e4e8994..56328030d5 100644 --- a/examples/opengl/hellogl_es/hellogl_es.pro +++ b/examples/opengl/hellogl_es/hellogl_es.pro @@ -8,6 +8,4 @@ HEADERS += glwindow.h RESOURCES += texture.qrc target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es -INSTALLS += target sources +INSTALLS += target diff --git a/examples/opengl/hellogl_es2/hellogl_es2.pro b/examples/opengl/hellogl_es2/hellogl_es2.pro index 4195ce2e67..cf6572b548 100644 --- a/examples/opengl/hellogl_es2/hellogl_es2.pro +++ b/examples/opengl/hellogl_es2/hellogl_es2.pro @@ -13,9 +13,7 @@ RESOURCES += texture.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellogl_es2.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellogl_es2 -INSTALLS += target sources +INSTALLS += target maemo5 { # Debian package name may not contain numbers or special characters diff --git a/examples/opengl/hellowindow/hellowindow.pro b/examples/opengl/hellowindow/hellowindow.pro index cc199f4d4d..cc220fd344 100644 --- a/examples/opengl/hellowindow/hellowindow.pro +++ b/examples/opengl/hellowindow/hellowindow.pro @@ -5,7 +5,5 @@ SOURCES += hellowindow.cpp main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellowindow -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellowindow.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/hellowindow -INSTALLS += target sources +INSTALLS += target diff --git a/examples/opengl/opengl.pro b/examples/opengl/opengl.pro index 387f8a0d75..1a6ac3aeb2 100644 --- a/examples/opengl/opengl.pro +++ b/examples/opengl/opengl.pro @@ -25,10 +25,6 @@ contains(QT_CONFIG, opengles1)|contains(QT_CONFIG, opengles2){ SUBDIRS += hellowindow \ paintedwindow -# install -target.path = $$[QT_INSTALL_EXAMPLES]/opengl -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS opengl.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl -INSTALLS += target sources +EXAMPLE_FILES = shared QT += widgets diff --git a/examples/opengl/overpainting/overpainting.pro b/examples/opengl/overpainting/overpainting.pro index 17ffbe6171..08fe9b3dae 100644 --- a/examples/opengl/overpainting/overpainting.pro +++ b/examples/opengl/overpainting/overpainting.pro @@ -12,14 +12,6 @@ SOURCES = bubble.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting -sources.files = $$SOURCES \ - $$HEADERS \ - $$RESOURCES \ - $$FORMS \ - overpainting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/overpainting -INSTALLS += target \ - sources - +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/paintedwindow/paintedwindow.pro b/examples/opengl/paintedwindow/paintedwindow.pro index fd7446ebc0..1846aa4049 100644 --- a/examples/opengl/paintedwindow/paintedwindow.pro +++ b/examples/opengl/paintedwindow/paintedwindow.pro @@ -3,6 +3,4 @@ SOURCES += paintedwindow.cpp main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/paintedwindow -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS paintedwindow.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/paintedwindow -INSTALLS += target sources +INSTALLS += target diff --git a/examples/opengl/pbuffers/pbuffers.pro b/examples/opengl/pbuffers/pbuffers.pro index 3145233179..1a9882c45d 100644 --- a/examples/opengl/pbuffers/pbuffers.pro +++ b/examples/opengl/pbuffers/pbuffers.pro @@ -8,14 +8,6 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers -sources.files = $$SOURCES \ - $$HEADERS \ - $$RESOURCES \ - pbuffers.pro \ - *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers -INSTALLS += target \ - sources - +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/pbuffers2/pbuffers2.pro b/examples/opengl/pbuffers2/pbuffers2.pro index 1cc8a5ad31..31fd22cced 100644 --- a/examples/opengl/pbuffers2/pbuffers2.pro +++ b/examples/opengl/pbuffers2/pbuffers2.pro @@ -6,8 +6,6 @@ RESOURCES += pbuffers2.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2 -sources.files = $$SOURCES $$HEADERS $$RESOURCES pbuffers2.pro *.png *.svg -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/pbuffers2 -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/samplebuffers/samplebuffers.pro b/examples/opengl/samplebuffers/samplebuffers.pro index 3196c6c45a..5793ea3e68 100644 --- a/examples/opengl/samplebuffers/samplebuffers.pro +++ b/examples/opengl/samplebuffers/samplebuffers.pro @@ -5,9 +5,7 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers -sources.files = $$SOURCES $$HEADERS samplebuffers.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/samplebuffers -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/opengl/textures/textures.pro b/examples/opengl/textures/textures.pro index ae8672d939..b912baaa9b 100644 --- a/examples/opengl/textures/textures.pro +++ b/examples/opengl/textures/textures.pro @@ -8,9 +8,7 @@ QT += opengl widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS textures.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/opengl/textures -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/qpa/qpa.pro b/examples/qpa/qpa.pro index 0eabfa8cf2..6f07e50fd8 100644 --- a/examples/qpa/qpa.pro +++ b/examples/qpa/qpa.pro @@ -1,8 +1,2 @@ TEMPLATE = subdirs SUBDIRS = windows - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qpa -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qpa.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qpa -INSTALLS += target sources diff --git a/examples/qpa/windows/windows.pro b/examples/qpa/windows/windows.pro index f0d53af625..cf2b7ab200 100644 --- a/examples/qpa/windows/windows.pro +++ b/examples/qpa/windows/windows.pro @@ -6,6 +6,4 @@ SOURCES += window.cpp main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/qpa/windows -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windows.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qpa/windows -INSTALLS += target sources +INSTALLS += target diff --git a/examples/qtconcurrent/imagescaling/imagescaling.pro b/examples/qtconcurrent/imagescaling/imagescaling.pro index 145764bfa0..e41bcc65e8 100644 --- a/examples/qtconcurrent/imagescaling/imagescaling.pro +++ b/examples/qtconcurrent/imagescaling/imagescaling.pro @@ -4,9 +4,7 @@ SOURCES += main.cpp imagescaling.cpp HEADERS += imagescaling.h target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/imagescaling -INSTALLS += target sources +INSTALLS += target wince*: DEPLOYMENT_PLUGIN += qgif qjpeg diff --git a/examples/qtconcurrent/map/map.pro b/examples/qtconcurrent/map/map.pro index 62d40d0f17..17022380d7 100644 --- a/examples/qtconcurrent/map/map.pro +++ b/examples/qtconcurrent/map/map.pro @@ -7,8 +7,6 @@ CONFIG -= app_bundle SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/map -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/progressdialog/progressdialog.pro b/examples/qtconcurrent/progressdialog/progressdialog.pro index 4789adf41f..c1b7e17dff 100644 --- a/examples/qtconcurrent/progressdialog/progressdialog.pro +++ b/examples/qtconcurrent/progressdialog/progressdialog.pro @@ -4,8 +4,6 @@ CONFIG += console SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/progressdialog -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/progressdialog -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/qtconcurrent.pro b/examples/qtconcurrent/qtconcurrent.pro index 58a5576568..72220b1ab3 100644 --- a/examples/qtconcurrent/qtconcurrent.pro +++ b/examples/qtconcurrent/qtconcurrent.pro @@ -15,9 +15,3 @@ contains(QT_CONFIG, no-widgets) { runfunction \ wordcount } - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtconcurrent.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent -INSTALLS += target sources diff --git a/examples/qtconcurrent/runfunction/runfunction.pro b/examples/qtconcurrent/runfunction/runfunction.pro index a73b56e857..d8820e20f7 100644 --- a/examples/qtconcurrent/runfunction/runfunction.pro +++ b/examples/qtconcurrent/runfunction/runfunction.pro @@ -5,8 +5,6 @@ CONFIG -= app_bundle SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/runfunction -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/runfunction -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtconcurrent/wordcount/wordcount.pro b/examples/qtconcurrent/wordcount/wordcount.pro index acb3d5454e..8b8285c4c0 100644 --- a/examples/qtconcurrent/wordcount/wordcount.pro +++ b/examples/qtconcurrent/wordcount/wordcount.pro @@ -5,8 +5,6 @@ CONFIG -= app_bundle SOURCES += main.cpp target.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/wordcount -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/qtconcurrent/wordcount -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/examples/qtestlib/qtestlib.pro b/examples/qtestlib/qtestlib.pro index 8addbcba63..383e5aa9e3 100644 --- a/examples/qtestlib/qtestlib.pro +++ b/examples/qtestlib/qtestlib.pro @@ -1,8 +1,2 @@ TEMPLATE = subdirs SUBDIRS = tutorial1 tutorial2 tutorial3 tutorial4 tutorial5 - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS qtestlib.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib -INSTALLS += target sources diff --git a/examples/qtestlib/tutorial1/tutorial1.pro b/examples/qtestlib/tutorial1/tutorial1.pro index 016de61d7b..8e77a9c5ff 100644 --- a/examples/qtestlib/tutorial1/tutorial1.pro +++ b/examples/qtestlib/tutorial1/tutorial1.pro @@ -3,8 +3,6 @@ QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial1 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/qtestlib/tutorial2/tutorial2.pro b/examples/qtestlib/tutorial2/tutorial2.pro index b8f73a9b52..58e70d4508 100644 --- a/examples/qtestlib/tutorial2/tutorial2.pro +++ b/examples/qtestlib/tutorial2/tutorial2.pro @@ -3,8 +3,6 @@ QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial2 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/qtestlib/tutorial3/tutorial3.pro b/examples/qtestlib/tutorial3/tutorial3.pro index 18183226ef..918dbf1187 100644 --- a/examples/qtestlib/tutorial3/tutorial3.pro +++ b/examples/qtestlib/tutorial3/tutorial3.pro @@ -3,8 +3,6 @@ QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial3 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/qtestlib/tutorial4/tutorial4.pro b/examples/qtestlib/tutorial4/tutorial4.pro index 6c82aa6500..f7b40dd4ca 100644 --- a/examples/qtestlib/tutorial4/tutorial4.pro +++ b/examples/qtestlib/tutorial4/tutorial4.pro @@ -3,8 +3,6 @@ QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial4 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/qtestlib/tutorial5/tutorial5.pro b/examples/qtestlib/tutorial5/tutorial5.pro index 3120c40912..facb21ea14 100644 --- a/examples/qtestlib/tutorial5/tutorial5.pro +++ b/examples/qtestlib/tutorial5/tutorial5.pro @@ -3,8 +3,6 @@ QT += testlib # install target.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/qtestlib/tutorial5 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/sql/books/books.pro b/examples/sql/books/books.pro index 4a15f62f0d..31c47ba04f 100644 --- a/examples/sql/books/books.pro +++ b/examples/sql/books/books.pro @@ -9,9 +9,7 @@ FORMS = bookwindow.ui QT += sql widgets widgets target.path = $$[QT_INSTALL_EXAMPLES]/sql/books -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/sql/books -INSTALLS += target sources +INSTALLS += target wince*: { diff --git a/examples/sql/cachedtable/cachedtable.pro b/examples/sql/cachedtable/cachedtable.pro index fca311d939..74f83bbec7 100644 --- a/examples/sql/cachedtable/cachedtable.pro +++ b/examples/sql/cachedtable/cachedtable.pro @@ -6,7 +6,5 @@ QT += sql widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/sql/cachedtable -sources.files = $$SOURCES *.h $$RESOURCES $$FORMS cachedtable.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/sql/cachedtable -INSTALLS += target sources +INSTALLS += target diff --git a/examples/sql/drilldown/drilldown.pro b/examples/sql/drilldown/drilldown.pro index 2743462b8e..ef286bbf25 100644 --- a/examples/sql/drilldown/drilldown.pro +++ b/examples/sql/drilldown/drilldown.pro @@ -11,6 +11,4 @@ QT += sql widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/sql/drilldown -sources.files = $$SOURCES *.h $$RESOURCES $$FORMS drilldown.pro *.png *.jpg images -sources.path = $$[QT_INSTALL_EXAMPLES]/sql/drilldown -INSTALLS += target sources +INSTALLS += target diff --git a/examples/sql/masterdetail/masterdetail.pro b/examples/sql/masterdetail/masterdetail.pro index e7935562c6..6f02aa0270 100644 --- a/examples/sql/masterdetail/masterdetail.pro +++ b/examples/sql/masterdetail/masterdetail.pro @@ -9,8 +9,8 @@ SOURCES = dialog.cpp \ QT += sql widgets QT += xml widgets +EXAMPLE_FILES = albumdetails.xml + # install target.path = $$[QT_INSTALL_EXAMPLES]/sql/masterdetail -sources.files = $$SOURCES *.h $$RESOURCES $$FORMS masterdetail.pro *.xml images -sources.path = $$[QT_INSTALL_EXAMPLES]/sql/masterdetail -INSTALLS += target sources +INSTALLS += target diff --git a/examples/sql/querymodel/querymodel.pro b/examples/sql/querymodel/querymodel.pro index 678ec93150..498c14e4dc 100644 --- a/examples/sql/querymodel/querymodel.pro +++ b/examples/sql/querymodel/querymodel.pro @@ -8,7 +8,5 @@ QT += sql widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/sql/querymodel -sources.files = $$SOURCES *.h $$RESOURCES $$FORMS querymodel.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/sql/querymodel -INSTALLS += target sources +INSTALLS += target diff --git a/examples/sql/relationaltablemodel/relationaltablemodel.pro b/examples/sql/relationaltablemodel/relationaltablemodel.pro index 5b21174657..677f5d886c 100644 --- a/examples/sql/relationaltablemodel/relationaltablemodel.pro +++ b/examples/sql/relationaltablemodel/relationaltablemodel.pro @@ -4,7 +4,5 @@ QT += sql widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/sql/relationaltablemodel -sources.files = $$SOURCES *.h $$RESOURCES $$FORMS relationaltablemodel.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/sql/relationaltablemodel -INSTALLS += target sources +INSTALLS += target diff --git a/examples/sql/sql.pro b/examples/sql/sql.pro index 64f103aa7d..95bf6404db 100644 --- a/examples/sql/sql.pro +++ b/examples/sql/sql.pro @@ -18,7 +18,5 @@ SUBDIRS = books \ } } -# install -sources.files = connection.h sql.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/sql -INSTALLS += sources +EXAMPLE_FILES = connection.h + diff --git a/examples/sql/sqlbrowser/sqlbrowser.pro b/examples/sql/sqlbrowser/sqlbrowser.pro index 3fca9a01a6..2983226b8b 100644 --- a/examples/sql/sqlbrowser/sqlbrowser.pro +++ b/examples/sql/sqlbrowser/sqlbrowser.pro @@ -14,9 +14,7 @@ build_all:!build_pass { # install target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlbrowser -sources.files = $$SOURCES $$HEADERS $$FORMS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlbrowser -INSTALLS += target sources +INSTALLS += target wince*: { diff --git a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro index 0de966c0e4..ae0e59a12b 100644 --- a/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro +++ b/examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro @@ -5,9 +5,7 @@ QT += sql widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/sql/sqlwidgetmapper -INSTALLS += target sources +INSTALLS += target wince*: DEPLOYMENT_PLUGIN += qsqlite diff --git a/examples/sql/tablemodel/tablemodel.pro b/examples/sql/tablemodel/tablemodel.pro index a6842b4c7f..ab339f26d2 100644 --- a/examples/sql/tablemodel/tablemodel.pro +++ b/examples/sql/tablemodel/tablemodel.pro @@ -4,7 +4,5 @@ QT += sql widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/sql/tablemodel -sources.files = $$SOURCES *.h $$RESOURCES $$FORMS tablemodel.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/sql/tablemodel -INSTALLS += target sources +INSTALLS += target diff --git a/examples/threads/mandelbrot/mandelbrot.pro b/examples/threads/mandelbrot/mandelbrot.pro index a2088cb8b0..08c320fff6 100644 --- a/examples/threads/mandelbrot/mandelbrot.pro +++ b/examples/threads/mandelbrot/mandelbrot.pro @@ -8,8 +8,6 @@ unix:!mac:!vxworks:!integrity:LIBS += -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mandelbrot.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/threads/queuedcustomtype/queuedcustomtype.pro b/examples/threads/queuedcustomtype/queuedcustomtype.pro index a2da59e55f..8b18b13ba6 100644 --- a/examples/threads/queuedcustomtype/queuedcustomtype.pro +++ b/examples/threads/queuedcustomtype/queuedcustomtype.pro @@ -9,8 +9,6 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mandelbrot.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/threads/mandelbrot -INSTALLS += target sources +INSTALLS += target diff --git a/examples/threads/semaphores/semaphores.pro b/examples/threads/semaphores/semaphores.pro index 49690a6b4b..ec199fa3c2 100644 --- a/examples/threads/semaphores/semaphores.pro +++ b/examples/threads/semaphores/semaphores.pro @@ -6,9 +6,7 @@ CONFIG += console # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/semaphores -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS semaphores.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/threads/semaphores -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/threads/threads.pro b/examples/threads/threads.pro index a97861d856..1ab89c4e0a 100644 --- a/examples/threads/threads.pro +++ b/examples/threads/threads.pro @@ -3,9 +3,3 @@ SUBDIRS = semaphores \ waitconditions !contains(QT_CONFIG, no-widgets):SUBDIRS += mandelbrot - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/threads -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS threads.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/threads -INSTALLS += target sources diff --git a/examples/threads/waitconditions/waitconditions.pro b/examples/threads/waitconditions/waitconditions.pro index a8298266f8..d077e6ca12 100644 --- a/examples/threads/waitconditions/waitconditions.pro +++ b/examples/threads/waitconditions/waitconditions.pro @@ -6,8 +6,6 @@ SOURCES += waitconditions.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/threads/waitconditions -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS waitconditions.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/threads/waitconditions -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/tools/contiguouscache/contiguouscache.pro b/examples/tools/contiguouscache/contiguouscache.pro index 2b8b3e9365..62cf862795 100644 --- a/examples/tools/contiguouscache/contiguouscache.pro +++ b/examples/tools/contiguouscache/contiguouscache.pro @@ -4,9 +4,7 @@ SOURCES = randomlistmodel.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/contiguouscache -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS contiguouscache.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/contiguouscache -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/tools/customtype/customtype.pro b/examples/tools/customtype/customtype.pro index 5282de0acb..4b6625d742 100644 --- a/examples/tools/customtype/customtype.pro +++ b/examples/tools/customtype/customtype.pro @@ -5,9 +5,7 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro resources -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/tools/customtypesending/customtypesending.pro b/examples/tools/customtypesending/customtypesending.pro index b86c101577..48bdd5d504 100644 --- a/examples/tools/customtypesending/customtypesending.pro +++ b/examples/tools/customtypesending/customtypesending.pro @@ -7,9 +7,7 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro resources -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/tools/tools.pro b/examples/tools/tools.pro index 4f02e01f61..10b487d6ae 100644 --- a/examples/tools/tools.pro +++ b/examples/tools/tools.pro @@ -3,9 +3,3 @@ CONFIG += ordered SUBDIRS = contiguouscache \ customtype \ customtypesending - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/tools -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS tools.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/tools -INSTALLS += target sources diff --git a/examples/touch/dials/dials.pro b/examples/touch/dials/dials.pro index c6259962e0..0da1103432 100644 --- a/examples/touch/dials/dials.pro +++ b/examples/touch/dials/dials.pro @@ -3,9 +3,7 @@ FORMS += dials.ui # install target.path = $$[QT_INSTALL_EXAMPLES]/touch/dials -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dials.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/touch/dials -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/touch/fingerpaint/fingerpaint.pro b/examples/touch/fingerpaint/fingerpaint.pro index a47aa98f67..a9083b39ca 100644 --- a/examples/touch/fingerpaint/fingerpaint.pro +++ b/examples/touch/fingerpaint/fingerpaint.pro @@ -6,9 +6,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fingerpaint.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/touch/fingerpaint -INSTALLS += target sources +INSTALLS += target QT += widgets !isEmpty(QT.printsupport.name): QT += printsupport diff --git a/examples/touch/knobs/knobs.pro b/examples/touch/knobs/knobs.pro index bf0c45845f..7540a4b2cf 100644 --- a/examples/touch/knobs/knobs.pro +++ b/examples/touch/knobs/knobs.pro @@ -3,9 +3,7 @@ SOURCES = main.cpp knob.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS knobs.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/touch/knobs -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/touch/pinchzoom/pinchzoom.pro b/examples/touch/pinchzoom/pinchzoom.pro index f841041e35..df7ce246c3 100644 --- a/examples/touch/pinchzoom/pinchzoom.pro +++ b/examples/touch/pinchzoom/pinchzoom.pro @@ -11,9 +11,7 @@ RESOURCES += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pinchzoom.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/touch/pinchzoom -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/touch/touch.pro b/examples/touch/touch.pro index cfbae8b590..d5983eb581 100644 --- a/examples/touch/touch.pro +++ b/examples/touch/touch.pro @@ -1,8 +1,2 @@ TEMPLATE = subdirs SUBDIRS = pinchzoom fingerpaint knobs dials - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/touch -sources.files = touch.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/touch -INSTALLS += target sources diff --git a/examples/widgets/animation/animatedtiles/animatedtiles.pro b/examples/widgets/animation/animatedtiles/animatedtiles.pro index 03907d10f4..c4e2553224 100644 --- a/examples/widgets/animation/animatedtiles/animatedtiles.pro +++ b/examples/widgets/animation/animatedtiles/animatedtiles.pro @@ -3,8 +3,6 @@ RESOURCES = animatedtiles.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/animatedtiles -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animatedtiles.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/animatedtiles -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/animation/animation.pro b/examples/widgets/animation/animation.pro index 7cc46a5613..575fed4ead 100644 --- a/examples/widgets/animation/animation.pro +++ b/examples/widgets/animation/animation.pro @@ -9,9 +9,4 @@ SUBDIRS += \ stickman \ sub-attaq \ -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS animation.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation -INSTALLS += target sources QT += widgets diff --git a/examples/widgets/animation/appchooser/appchooser.pro b/examples/widgets/animation/appchooser/appchooser.pro index ac7b0ca335..8560db2c4c 100644 --- a/examples/widgets/animation/appchooser/appchooser.pro +++ b/examples/widgets/animation/appchooser/appchooser.pro @@ -3,8 +3,6 @@ RESOURCES = appchooser.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/appchooser -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS appchooser.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/appchooser -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/animation/easing/easing.pro b/examples/widgets/animation/easing/easing.pro index 3263d07089..0e430df1ba 100644 --- a/examples/widgets/animation/easing/easing.pro +++ b/examples/widgets/animation/easing/easing.pro @@ -9,9 +9,7 @@ RESOURCES = easing.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/easing -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS easing.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/easing -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/animation/moveblocks/moveblocks.pro b/examples/widgets/animation/moveblocks/moveblocks.pro index b7335652c0..2992315064 100644 --- a/examples/widgets/animation/moveblocks/moveblocks.pro +++ b/examples/widgets/animation/moveblocks/moveblocks.pro @@ -2,8 +2,6 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/moveblocks -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS moveblocks.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/moveblocks -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/animation/states/states.pro b/examples/widgets/animation/states/states.pro index 9ab3113111..563160ce9f 100644 --- a/examples/widgets/animation/states/states.pro +++ b/examples/widgets/animation/states/states.pro @@ -3,8 +3,6 @@ RESOURCES += states.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/states -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS states.pro *.png -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/states -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/animation/stickman/stickman.pro b/examples/widgets/animation/stickman/stickman.pro index 527fdf1132..145a9a18f9 100644 --- a/examples/widgets/animation/stickman/stickman.pro +++ b/examples/widgets/animation/stickman/stickman.pro @@ -16,8 +16,6 @@ RESOURCES += stickman.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/stickman -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stickman.pro animations -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/stickman -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/animation/sub-attaq/sub-attaq.pro b/examples/widgets/animation/sub-attaq/sub-attaq.pro index 835fc8d2d8..3ed823d1e6 100644 --- a/examples/widgets/animation/sub-attaq/sub-attaq.pro +++ b/examples/widgets/animation/sub-attaq/sub-attaq.pro @@ -31,13 +31,4 @@ RESOURCES += subattaq.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/sub-attaq -sources.files = $$SOURCES \ - $$HEADERS \ - $$RESOURCES \ - $$FORMS \ - sub-attaq.pro \ - pics \ - data.xml -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/animation/sub-attaq -INSTALLS += target \ - sources +INSTALLS += target diff --git a/examples/widgets/desktop/desktop.pro b/examples/widgets/desktop/desktop.pro index 79d85e41fa..5da59599d4 100644 --- a/examples/widgets/desktop/desktop.pro +++ b/examples/widgets/desktop/desktop.pro @@ -2,10 +2,4 @@ TEMPLATE = subdirs CONFIG += ordered SUBDIRS = screenshot systray -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS desktop.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop -INSTALLS += target sources - QT += widgets diff --git a/examples/widgets/desktop/screenshot/screenshot.pro b/examples/widgets/desktop/screenshot/screenshot.pro index bcab23918b..31ea646af0 100644 --- a/examples/widgets/desktop/screenshot/screenshot.pro +++ b/examples/widgets/desktop/screenshot/screenshot.pro @@ -4,9 +4,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/screenshot -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS screenshot.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/screenshot -INSTALLS += target sources +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/desktop/systray/systray.pro b/examples/widgets/desktop/systray/systray.pro index c028b04f04..270f950f10 100644 --- a/examples/widgets/desktop/systray/systray.pro +++ b/examples/widgets/desktop/systray/systray.pro @@ -7,8 +7,6 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/systray -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS systray.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/desktop/systray -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/dialogs/classwizard/classwizard.pro b/examples/widgets/dialogs/classwizard/classwizard.pro index 9802584d75..9b272b9d3f 100644 --- a/examples/widgets/dialogs/classwizard/classwizard.pro +++ b/examples/widgets/dialogs/classwizard/classwizard.pro @@ -5,9 +5,7 @@ RESOURCES = classwizard.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/classwizard -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/classwizard -INSTALLS += target sources +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/dialogs/configdialog/configdialog.pro b/examples/widgets/dialogs/configdialog/configdialog.pro index fbef658523..616b5fd650 100644 --- a/examples/widgets/dialogs/configdialog/configdialog.pro +++ b/examples/widgets/dialogs/configdialog/configdialog.pro @@ -7,9 +7,7 @@ RESOURCES += configdialog.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/configdialog -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/configdialog -INSTALLS += target sources +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 af916ea029..ab33609bcd 100644 --- a/examples/widgets/dialogs/dialogs.pro +++ b/examples/widgets/dialogs/dialogs.pro @@ -11,9 +11,4 @@ SUBDIRS = classwizard \ wince*: SUBDIRS += sipdialog -# install -sources.files = README *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs -INSTALLS += sources - QT += widgets diff --git a/examples/widgets/dialogs/extension/extension.pro b/examples/widgets/dialogs/extension/extension.pro index 91eccf5a72..e7cf493128 100644 --- a/examples/widgets/dialogs/extension/extension.pro +++ b/examples/widgets/dialogs/extension/extension.pro @@ -4,9 +4,7 @@ SOURCES = finddialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/extension -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/extension -INSTALLS += target sources +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/dialogs/findfiles/findfiles.pro b/examples/widgets/dialogs/findfiles/findfiles.pro index fe4ec427d3..f02ec69e4c 100644 --- a/examples/widgets/dialogs/findfiles/findfiles.pro +++ b/examples/widgets/dialogs/findfiles/findfiles.pro @@ -4,8 +4,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/findfiles -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/findfiles -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/dialogs/licensewizard/licensewizard.pro b/examples/widgets/dialogs/licensewizard/licensewizard.pro index 8d5bed4858..4bcfdad384 100644 --- a/examples/widgets/dialogs/licensewizard/licensewizard.pro +++ b/examples/widgets/dialogs/licensewizard/licensewizard.pro @@ -5,9 +5,7 @@ RESOURCES = licensewizard.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/licensewizard -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/licensewizard -INSTALLS += target sources +INSTALLS += target QT += widgets printsupport simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/dialogs/sipdialog/sipdialog.pro b/examples/widgets/dialogs/sipdialog/sipdialog.pro index 57b4ac6331..5e24335e8c 100644 --- a/examples/widgets/dialogs/sipdialog/sipdialog.pro +++ b/examples/widgets/dialogs/sipdialog/sipdialog.pro @@ -4,9 +4,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/sipdialog -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/sipdialog -INSTALLS += target sources +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/standarddialogs/standarddialogs.pro b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro index 86bc7c46b1..89d0ad9a39 100644 --- a/examples/widgets/dialogs/standarddialogs/standarddialogs.pro +++ b/examples/widgets/dialogs/standarddialogs/standarddialogs.pro @@ -4,9 +4,7 @@ SOURCES = dialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/standarddialogs -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/standarddialogs -INSTALLS += target sources +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 9c62dfb608..656c661844 100644 --- a/examples/widgets/dialogs/tabdialog/tabdialog.pro +++ b/examples/widgets/dialogs/tabdialog/tabdialog.pro @@ -4,9 +4,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/tabdialog -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/tabdialog -INSTALLS += target sources +INSTALLS += target wince50standard-x86-msvc2005: LIBS += libcmt.lib corelibc.lib ole32.lib oleaut32.lib uuid.lib commctrl.lib coredll.lib winsock.lib ws2.lib QT += widgets diff --git a/examples/widgets/dialogs/trivialwizard/trivialwizard.pro b/examples/widgets/dialogs/trivialwizard/trivialwizard.pro index cf3d7316f5..63831e8576 100644 --- a/examples/widgets/dialogs/trivialwizard/trivialwizard.pro +++ b/examples/widgets/dialogs/trivialwizard/trivialwizard.pro @@ -2,9 +2,7 @@ SOURCES = trivialwizard.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/trivialwizard -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/dialogs/trivialwizard -INSTALLS += target sources +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/draganddrop/draganddrop.pro b/examples/widgets/draganddrop/draganddrop.pro index 06a161e1ac..3f2691a516 100644 --- a/examples/widgets/draganddrop/draganddrop.pro +++ b/examples/widgets/draganddrop/draganddrop.pro @@ -6,8 +6,4 @@ SUBDIRS = draggableicons \ puzzle wince*: SUBDIRS -= dropsite -# install -sources.files = README *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop -INSTALLS += sources QT += widgets diff --git a/examples/widgets/draganddrop/draggableicons/draggableicons.pro b/examples/widgets/draganddrop/draggableicons/draggableicons.pro index e9398e0342..194814a8c8 100644 --- a/examples/widgets/draganddrop/draggableicons/draggableicons.pro +++ b/examples/widgets/draganddrop/draggableicons/draggableicons.pro @@ -5,8 +5,6 @@ SOURCES = dragwidget.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/draggableicons -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/draggableicons -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/draganddrop/draggabletext/draggabletext.pro b/examples/widgets/draganddrop/draggabletext/draggabletext.pro index db40af37cc..1eb579a2bd 100644 --- a/examples/widgets/draganddrop/draggabletext/draggabletext.pro +++ b/examples/widgets/draganddrop/draggabletext/draggabletext.pro @@ -7,9 +7,7 @@ SOURCES = draglabel.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/draggabletext -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.txt *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/draggabletext -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/draganddrop/dropsite/dropsite.pro b/examples/widgets/draganddrop/dropsite/dropsite.pro index 06bca8a1ae..008030be85 100644 --- a/examples/widgets/draganddrop/dropsite/dropsite.pro +++ b/examples/widgets/draganddrop/dropsite/dropsite.pro @@ -6,9 +6,7 @@ SOURCES = droparea.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/dropsite -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/dropsite -INSTALLS += target sources +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro b/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro index ac6adb354c..350dee6561 100644 --- a/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro +++ b/examples/widgets/draganddrop/fridgemagnets/fridgemagnets.pro @@ -7,9 +7,7 @@ SOURCES = draglabel.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/fridgemagnets -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/fridgemagnets -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/draganddrop/puzzle/puzzle.pro b/examples/widgets/draganddrop/puzzle/puzzle.pro index 27acea6590..4d85778073 100644 --- a/examples/widgets/draganddrop/puzzle/puzzle.pro +++ b/examples/widgets/draganddrop/puzzle/puzzle.pro @@ -11,9 +11,7 @@ QMAKE_PROJECT_NAME = dndpuzzle # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/puzzle -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/draganddrop/puzzle -INSTALLS += target sources +INSTALLS += target wince*: { addFile.files = example.jpg diff --git a/examples/widgets/effects/blurpicker/blurpicker.pro b/examples/widgets/effects/blurpicker/blurpicker.pro index 105b7a49e7..1d232190ac 100644 --- a/examples/widgets/effects/blurpicker/blurpicker.pro +++ b/examples/widgets/effects/blurpicker/blurpicker.pro @@ -4,8 +4,6 @@ RESOURCES += blurpicker.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/blurpicker -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS blurpicker.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/blurpicker -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/effects/effects.pro b/examples/widgets/effects/effects.pro index 74c2d1c039..ee3d655815 100644 --- a/examples/widgets/effects/effects.pro +++ b/examples/widgets/effects/effects.pro @@ -5,10 +5,4 @@ SUBDIRS = \ lighting \ fademessage -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS effects.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects -INSTALLS += target sources - QT += widgets diff --git a/examples/widgets/effects/fademessage/fademessage.pro b/examples/widgets/effects/fademessage/fademessage.pro index 89953eb18b..ff860af4f1 100644 --- a/examples/widgets/effects/fademessage/fademessage.pro +++ b/examples/widgets/effects/fademessage/fademessage.pro @@ -1,18 +1,10 @@ SOURCES += main.cpp fademessage.cpp HEADERS += fademessage.h RESOURCES += fademessage.qrc -INSTALLS += target sources # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/fademessage -sources.files = $$SOURCES \ - $$HEADERS \ - $$RESOURCES \ - $$FORMS \ - fademessage.pro \ - background.jpg -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/fademessage - +INSTALLS += target QT += widgets simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/effects/lighting/lighting.pro b/examples/widgets/effects/lighting/lighting.pro index 2ab7811e4f..5450b62093 100644 --- a/examples/widgets/effects/lighting/lighting.pro +++ b/examples/widgets/effects/lighting/lighting.pro @@ -3,9 +3,7 @@ HEADERS += lighting.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/lighting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS lighting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/effects/lighting -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro b/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro index 8fb03edd60..bc396226c8 100644 --- a/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro +++ b/examples/widgets/graphicsview/anchorlayout/anchorlayout.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/anchorlayout -sources.files = $$SOURCES $$HEADERS $$RESOURCES anchorlayout.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/anchorlayout -INSTALLS += target sources +INSTALLS += target TARGET = anchorlayout QT += widgets diff --git a/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro b/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro index 3de54d7757..59abd2b405 100644 --- a/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro +++ b/examples/widgets/graphicsview/basicgraphicslayouts/basicgraphicslayouts.pro @@ -7,8 +7,6 @@ RESOURCES = basicgraphicslayouts.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/basicgraphicslayouts -sources.files = $$SOURCES $$HEADERS $$RESOURCES basicgraphicslayouts.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/basicgraphicslayouts -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/boxes/boxes.pro b/examples/widgets/graphicsview/boxes/boxes.pro index 1fc91352c7..a4b253c580 100644 --- a/examples/widgets/graphicsview/boxes/boxes.pro +++ b/examples/widgets/graphicsview/boxes/boxes.pro @@ -21,11 +21,7 @@ RESOURCES += boxes.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/boxes -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg *.png *.fsh *.vsh *.par -sources.files -= 3rdparty/fbm.h 3rdparty/fbm.c -sources.files += 3rdparty -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/boxes -INSTALLS += target sources +INSTALLS += target wince*: { DEPLOYMENT_PLUGIN += qjpeg diff --git a/examples/widgets/graphicsview/chip/chip.pro b/examples/widgets/graphicsview/chip/chip.pro index a979d60da0..8e3d91f38e 100644 --- a/examples/widgets/graphicsview/chip/chip.pro +++ b/examples/widgets/graphicsview/chip/chip.pro @@ -15,7 +15,5 @@ build_all:!build_pass { # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/chip -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/chip -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/graphicsview/collidingmice/collidingmice.pro b/examples/widgets/graphicsview/collidingmice/collidingmice.pro index 10755cdb65..0337b6da4a 100644 --- a/examples/widgets/graphicsview/collidingmice/collidingmice.pro +++ b/examples/widgets/graphicsview/collidingmice/collidingmice.pro @@ -9,9 +9,7 @@ RESOURCES += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/collidingmice -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS collidingmice.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/collidingmice -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/diagramscene/diagramscene.pro b/examples/widgets/graphicsview/diagramscene/diagramscene.pro index cc97758b43..ac70e7af17 100644 --- a/examples/widgets/graphicsview/diagramscene/diagramscene.pro +++ b/examples/widgets/graphicsview/diagramscene/diagramscene.pro @@ -14,9 +14,7 @@ RESOURCES = diagramscene.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/diagramscene -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS diagramscene.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/diagramscene -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro index 1e21ee8b9e..4f8cebc755 100644 --- a/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro +++ b/examples/widgets/graphicsview/dragdroprobot/dragdroprobot.pro @@ -13,9 +13,7 @@ RESOURCES += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/dragdroprobot -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dragdroprobot.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/dragdroprobot -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro b/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro index 3fd8bc714f..71ac21ffe9 100644 --- a/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro +++ b/examples/widgets/graphicsview/elasticnodes/elasticnodes.pro @@ -11,8 +11,6 @@ SOURCES += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/elasticnodes -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS elasticnodes.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/elasticnodes -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro index 7b62473050..dd01312788 100644 --- a/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro +++ b/examples/widgets/graphicsview/embeddeddialogs/embeddeddialogs.pro @@ -12,8 +12,6 @@ build_all:!build_pass { # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/embeddeddialogs -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.png *.jpg *.plist *.icns *.ico *.rc *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/embeddeddialogs -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/graphicsview/flowlayout/flowlayout.pro b/examples/widgets/graphicsview/flowlayout/flowlayout.pro index 8a98c87032..ec5ef17a0e 100644 --- a/examples/widgets/graphicsview/flowlayout/flowlayout.pro +++ b/examples/widgets/graphicsview/flowlayout/flowlayout.pro @@ -7,8 +7,6 @@ SOURCES += flowlayout.cpp main.cpp window.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/flowlayout -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/flowlayout -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/graphicsview/graphicsview.pro b/examples/widgets/graphicsview/graphicsview.pro index 590e79c5d2..f7142709c8 100644 --- a/examples/widgets/graphicsview/graphicsview.pro +++ b/examples/widgets/graphicsview/graphicsview.pro @@ -19,10 +19,4 @@ contains(QT_CONFIG, opengl):!contains(QT_CONFIG, opengles1):!contains(QT_CONFIG, SUBDIRS += boxes } -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview -INSTALLS += target sources - QT += widgets diff --git a/examples/widgets/graphicsview/padnavigator/padnavigator.pro b/examples/widgets/graphicsview/padnavigator/padnavigator.pro index efbb09308f..460cc90219 100644 --- a/examples/widgets/graphicsview/padnavigator/padnavigator.pro +++ b/examples/widgets/graphicsview/padnavigator/padnavigator.pro @@ -21,8 +21,6 @@ contains(QT_CONFIG, opengl):QT += opengl # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/padnavigator -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS padnavigator.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/padnavigator -INSTALLS += target sources +INSTALLS += target CONFIG += console diff --git a/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro b/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro index 0378c375a1..c8c992adbe 100644 --- a/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro +++ b/examples/widgets/graphicsview/simpleanchorlayout/simpleanchorlayout.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/simpleanchorlayout -sources.files = $$SOURCES $$HEADERS $$RESOURCES simpleanchorlayout.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/simpleanchorlayout -INSTALLS += target sources +INSTALLS += target TARGET = simpleanchorlayout QT += widgets diff --git a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro b/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro index 5cd625f9b4..cb44ac4ec2 100644 --- a/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro +++ b/examples/widgets/graphicsview/weatheranchorlayout/weatheranchorlayout.pro @@ -5,8 +5,6 @@ RESOURCES += weatheranchorlayout.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/weatheranchorlayout -sources.files = $$SOURCES $$HEADERS $$RESOURCES weatheranchorlayout.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/graphicsview/weatheranchorlayout -INSTALLS += target sources +INSTALLS += target simulator: warning(This example might not fully work on Simulator platform) diff --git a/examples/widgets/itemviews/addressbook/addressbook.pro b/examples/widgets/itemviews/addressbook/addressbook.pro index d9c98af291..0d421cb3e3 100644 --- a/examples/widgets/itemviews/addressbook/addressbook.pro +++ b/examples/widgets/itemviews/addressbook/addressbook.pro @@ -12,8 +12,6 @@ HEADERS = adddialog.h \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/addressbook -sources.files = $$SOURCES $$HEADERS $$RESOURCES addressbook.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/addressbook -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro b/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro index 7f30812305..6c0924cf7f 100644 --- a/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro +++ b/examples/widgets/itemviews/basicsortfiltermodel/basicsortfiltermodel.pro @@ -5,8 +5,6 @@ CONFIG += qt # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/basicsortfiltermodel -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/basicsortfiltermodel -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/chart/chart.pro b/examples/widgets/itemviews/chart/chart.pro index f67d38266e..927c469e88 100644 --- a/examples/widgets/itemviews/chart/chart.pro +++ b/examples/widgets/itemviews/chart/chart.pro @@ -8,9 +8,7 @@ unix:!mac:!vxworks:!integrity:LIBS+= -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/chart -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.cht -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/chart -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro b/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro index 4ee87e0b57..4c16a6fbc1 100644 --- a/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro +++ b/examples/widgets/itemviews/coloreditorfactory/coloreditorfactory.pro @@ -6,9 +6,7 @@ SOURCES = colorlisteditor.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/coloreditorfactory -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/coloreditorfactory -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro b/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro index c4320625a9..a093f88e88 100644 --- a/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro +++ b/examples/widgets/itemviews/combowidgetmapper/combowidgetmapper.pro @@ -4,8 +4,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/combowidgetmapper -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/combowidgetmapper -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro index 762f932c3c..66ea1063c8 100644 --- a/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro +++ b/examples/widgets/itemviews/customsortfiltermodel/customsortfiltermodel.pro @@ -7,8 +7,6 @@ CONFIG += qt # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/customsortfiltermodel -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/customsortfiltermodel -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/dirview/dirview.pro b/examples/widgets/itemviews/dirview/dirview.pro index 481bddf3b3..0c1cd92a58 100644 --- a/examples/widgets/itemviews/dirview/dirview.pro +++ b/examples/widgets/itemviews/dirview/dirview.pro @@ -2,8 +2,6 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/dirview -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/dirview -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro b/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro index 43d9634a3b..fcbdfd997f 100644 --- a/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro +++ b/examples/widgets/itemviews/editabletreemodel/editabletreemodel.pro @@ -11,8 +11,6 @@ CONFIG += qt # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/editabletreemodel -sources.files = $$FORMS $$HEADERS $$RESOURCES $$SOURCES *.pro *.txt -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/editabletreemodel -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/fetchmore/fetchmore.pro b/examples/widgets/itemviews/fetchmore/fetchmore.pro index a0abf64b7a..67006de9c7 100644 --- a/examples/widgets/itemviews/fetchmore/fetchmore.pro +++ b/examples/widgets/itemviews/fetchmore/fetchmore.pro @@ -6,8 +6,6 @@ SOURCES = filelistmodel.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/fetchmore -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/fetchmore -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/frozencolumn/frozencolumn.pro b/examples/widgets/itemviews/frozencolumn/frozencolumn.pro index 6d8074ebaa..00247b71c7 100644 --- a/examples/widgets/itemviews/frozencolumn/frozencolumn.pro +++ b/examples/widgets/itemviews/frozencolumn/frozencolumn.pro @@ -4,8 +4,6 @@ RESOURCES += grades.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/frozencolumn -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro grades.txt -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/frozencolumn -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/interview/interview.pro b/examples/widgets/itemviews/interview/interview.pro index ce5e3cb316..08dd9b991e 100644 --- a/examples/widgets/itemviews/interview/interview.pro +++ b/examples/widgets/itemviews/interview/interview.pro @@ -12,8 +12,6 @@ build_all:!build_pass { # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/interview -sources.files = $$SOURCES $$HEADERS $$RESOURCES README *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/interview -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/itemviews.pro b/examples/widgets/itemviews/itemviews.pro index 86b2a63d14..60512e2b66 100644 --- a/examples/widgets/itemviews/itemviews.pro +++ b/examples/widgets/itemviews/itemviews.pro @@ -19,9 +19,4 @@ SUBDIRS = addressbook \ spreadsheet \ stardelegate -# install -sources.files = README *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews -INSTALLS += sources - QT += widgets diff --git a/examples/widgets/itemviews/pixelator/pixelator.pro b/examples/widgets/itemviews/pixelator/pixelator.pro index e5ba8e253f..37e54f937a 100644 --- a/examples/widgets/itemviews/pixelator/pixelator.pro +++ b/examples/widgets/itemviews/pixelator/pixelator.pro @@ -9,9 +9,7 @@ RESOURCES += images.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/pixelator -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/pixelator -INSTALLS += target sources +INSTALLS += target QT += widgets !isEmpty(QT.printsupport.name): QT += printsupport diff --git a/examples/widgets/itemviews/puzzle/puzzle.pro b/examples/widgets/itemviews/puzzle/puzzle.pro index fe912656d1..a05ad83f79 100644 --- a/examples/widgets/itemviews/puzzle/puzzle.pro +++ b/examples/widgets/itemviews/puzzle/puzzle.pro @@ -9,9 +9,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/puzzle -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/puzzle -INSTALLS += target sources +INSTALLS += target wince* { diff --git a/examples/widgets/itemviews/simpledommodel/simpledommodel.pro b/examples/widgets/itemviews/simpledommodel/simpledommodel.pro index c0399bd96b..e52ea4f71e 100644 --- a/examples/widgets/itemviews/simpledommodel/simpledommodel.pro +++ b/examples/widgets/itemviews/simpledommodel/simpledommodel.pro @@ -10,7 +10,5 @@ QT += xml widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpledommodel -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpledommodel -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro index f18f8eb81f..289939fb2f 100644 --- a/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro +++ b/examples/widgets/itemviews/simpletreemodel/simpletreemodel.pro @@ -8,8 +8,6 @@ CONFIG += qt # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpletreemodel -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.txt -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simpletreemodel -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro b/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro index fac8aabe57..c19cb0eef8 100644 --- a/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro +++ b/examples/widgets/itemviews/simplewidgetmapper/simplewidgetmapper.pro @@ -4,8 +4,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simplewidgetmapper -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/simplewidgetmapper -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro b/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro index 27ea88f50e..c156a4f425 100644 --- a/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro +++ b/examples/widgets/itemviews/spinboxdelegate/spinboxdelegate.pro @@ -4,9 +4,7 @@ SOURCES = delegate.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/spinboxdelegate -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/spinboxdelegate -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.pro b/examples/widgets/itemviews/spreadsheet/spreadsheet.pro index d551b900c8..b69811a4b8 100644 --- a/examples/widgets/itemviews/spreadsheet/spreadsheet.pro +++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.pro @@ -17,7 +17,5 @@ build_all:!build_pass { # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/spreadsheet -sources.files = $$SOURCES $$RESOURCES *.pro images $$HEADERS -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/spreadsheet -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/itemviews/stardelegate/stardelegate.pro b/examples/widgets/itemviews/stardelegate/stardelegate.pro index 4ea0d892ca..13c260d268 100644 --- a/examples/widgets/itemviews/stardelegate/stardelegate.pro +++ b/examples/widgets/itemviews/stardelegate/stardelegate.pro @@ -8,9 +8,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/stardelegate -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/itemviews/stardelegate -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/layouts/basiclayouts/basiclayouts.pro b/examples/widgets/layouts/basiclayouts/basiclayouts.pro index 39cfa65661..cfa8594516 100644 --- a/examples/widgets/layouts/basiclayouts/basiclayouts.pro +++ b/examples/widgets/layouts/basiclayouts/basiclayouts.pro @@ -4,9 +4,7 @@ SOURCES = dialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/basiclayouts -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/basiclayouts -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/layouts/borderlayout/borderlayout.pro b/examples/widgets/layouts/borderlayout/borderlayout.pro index 0260162cbb..2b7d55919a 100644 --- a/examples/widgets/layouts/borderlayout/borderlayout.pro +++ b/examples/widgets/layouts/borderlayout/borderlayout.pro @@ -6,8 +6,6 @@ SOURCES = borderlayout.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/borderlayout -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/borderlayout -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro index 43e0606357..293137c426 100644 --- a/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro +++ b/examples/widgets/layouts/dynamiclayouts/dynamiclayouts.pro @@ -4,9 +4,7 @@ SOURCES = dialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/dynamiclayouts -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/dynamiclayouts -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/layouts/flowlayout/flowlayout.pro b/examples/widgets/layouts/flowlayout/flowlayout.pro index f2a3e99226..bd977f2a0e 100644 --- a/examples/widgets/layouts/flowlayout/flowlayout.pro +++ b/examples/widgets/layouts/flowlayout/flowlayout.pro @@ -6,8 +6,6 @@ SOURCES = flowlayout.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/flowlayout -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts/flowlayout -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/layouts/layouts.pro b/examples/widgets/layouts/layouts.pro index 230e6a5ce4..cfd9b4b01c 100644 --- a/examples/widgets/layouts/layouts.pro +++ b/examples/widgets/layouts/layouts.pro @@ -4,9 +4,4 @@ SUBDIRS = basiclayouts \ dynamiclayouts \ flowlayout -# install -sources.files = README *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/layouts -INSTALLS += sources - QT += widgets diff --git a/examples/widgets/mainwindows/application/application.pro b/examples/widgets/mainwindows/application/application.pro index 3768ce5d66..f202a60979 100644 --- a/examples/widgets/mainwindows/application/application.pro +++ b/examples/widgets/mainwindows/application/application.pro @@ -7,9 +7,7 @@ RESOURCES = application.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/application -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS application.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/application -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro b/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro index 598cfae971..ec3a5813e1 100644 --- a/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro +++ b/examples/widgets/mainwindows/dockwidgets/dockwidgets.pro @@ -5,9 +5,7 @@ RESOURCES = dockwidgets.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/dockwidgets -sources.files = $$SOURCES $$HEADERS $$RESOURCES dockwidgets.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/dockwidgets -INSTALLS += target sources +INSTALLS += target QT += widgets !isEmpty(QT.printsupport.name): QT += printsupport diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.pro b/examples/widgets/mainwindows/mainwindow/mainwindow.pro index b5cd71b1bf..2bef5f0b71 100644 --- a/examples/widgets/mainwindows/mainwindow/mainwindow.pro +++ b/examples/widgets/mainwindows/mainwindow/mainwindow.pro @@ -10,8 +10,6 @@ RESOURCES += mainwindow.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/mainwindow -sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.png *.jpg *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/mainwindow -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/mainwindows/mainwindows.pro b/examples/widgets/mainwindows/mainwindows.pro index 1f2fa419f5..848fdb04df 100644 --- a/examples/widgets/mainwindows/mainwindows.pro +++ b/examples/widgets/mainwindows/mainwindows.pro @@ -7,10 +7,4 @@ SUBDIRS = application \ recentfiles \ sdi -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mainwindows.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows -INSTALLS += target sources - QT += widgets diff --git a/examples/widgets/mainwindows/mdi/mdi.pro b/examples/widgets/mainwindows/mdi/mdi.pro index 88efd0e6cf..786bbd3569 100644 --- a/examples/widgets/mainwindows/mdi/mdi.pro +++ b/examples/widgets/mainwindows/mdi/mdi.pro @@ -7,9 +7,7 @@ RESOURCES = mdi.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/mdi -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS mdi.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/mdi -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/mainwindows/menus/menus.pro b/examples/widgets/mainwindows/menus/menus.pro index e383b6c426..1ac5df4a3b 100644 --- a/examples/widgets/mainwindows/menus/menus.pro +++ b/examples/widgets/mainwindows/menus/menus.pro @@ -4,8 +4,6 @@ SOURCES = mainwindow.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/menus -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS menus.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/menus -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/mainwindows/recentfiles/recentfiles.pro b/examples/widgets/mainwindows/recentfiles/recentfiles.pro index d11c47b850..4ab5a6820e 100644 --- a/examples/widgets/mainwindows/recentfiles/recentfiles.pro +++ b/examples/widgets/mainwindows/recentfiles/recentfiles.pro @@ -4,9 +4,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/recentfiles -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS recentfiles.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/recentfiles -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/mainwindows/sdi/sdi.pro b/examples/widgets/mainwindows/sdi/sdi.pro index e9fc0b6bdd..30ae4f5f3d 100644 --- a/examples/widgets/mainwindows/sdi/sdi.pro +++ b/examples/widgets/mainwindows/sdi/sdi.pro @@ -5,9 +5,7 @@ RESOURCES = sdi.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/sdi -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS sdi.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/mainwindows/sdi -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/painting/affine/affine.pro b/examples/widgets/painting/affine/affine.pro index b9c575ebb9..e94f4d12fb 100644 --- a/examples/widgets/painting/affine/affine.pro +++ b/examples/widgets/painting/affine/affine.pro @@ -15,9 +15,7 @@ RESOURCES += affine.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/affine -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.jpg -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/affine -INSTALLS += target sources +INSTALLS += target wince*: { DEPLOYMENT_PLUGIN += qjpeg diff --git a/examples/widgets/painting/basicdrawing/basicdrawing.pro b/examples/widgets/painting/basicdrawing/basicdrawing.pro index 60b768f85a..52ee0d4402 100644 --- a/examples/widgets/painting/basicdrawing/basicdrawing.pro +++ b/examples/widgets/painting/basicdrawing/basicdrawing.pro @@ -7,8 +7,6 @@ RESOURCES = basicdrawing.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/basicdrawing -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basicdrawing.pro images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/basicdrawing -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/painting/composition/composition.pro b/examples/widgets/painting/composition/composition.pro index 05b38cee06..7ff82d789a 100644 --- a/examples/widgets/painting/composition/composition.pro +++ b/examples/widgets/painting/composition/composition.pro @@ -14,9 +14,7 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/composition -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.png *.jpg *.pro *.html -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/composition -INSTALLS += target sources +INSTALLS += target win32-msvc* { diff --git a/examples/widgets/painting/concentriccircles/concentriccircles.pro b/examples/widgets/painting/concentriccircles/concentriccircles.pro index 1b97867752..9690465d46 100644 --- a/examples/widgets/painting/concentriccircles/concentriccircles.pro +++ b/examples/widgets/painting/concentriccircles/concentriccircles.pro @@ -6,9 +6,7 @@ SOURCES = circlewidget.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/concentriccircles -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS concentriccircles.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/concentriccircles -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/painting/deform/deform.pro b/examples/widgets/painting/deform/deform.pro index eff007464d..01dc0a869c 100644 --- a/examples/widgets/painting/deform/deform.pro +++ b/examples/widgets/painting/deform/deform.pro @@ -15,6 +15,4 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/deform -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/deform -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/painting/fontsampler/fontsampler.pro b/examples/widgets/painting/fontsampler/fontsampler.pro index 0f913b43a2..c32fc40572 100644 --- a/examples/widgets/painting/fontsampler/fontsampler.pro +++ b/examples/widgets/painting/fontsampler/fontsampler.pro @@ -5,9 +5,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/fontsampler -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/fontsampler -INSTALLS += target sources +INSTALLS += target QT += widgets !isEmpty(QT.printsupport.name): QT += printsupport diff --git a/examples/widgets/painting/gradients/gradients.pro b/examples/widgets/painting/gradients/gradients.pro index ed78e4fd2a..a7d6ae68d1 100644 --- a/examples/widgets/painting/gradients/gradients.pro +++ b/examples/widgets/painting/gradients/gradients.pro @@ -14,7 +14,5 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/gradients -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/gradients -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/painting/imagecomposition/imagecomposition.pro b/examples/widgets/painting/imagecomposition/imagecomposition.pro index 095e1e7f2d..ce23c601f5 100644 --- a/examples/widgets/painting/imagecomposition/imagecomposition.pro +++ b/examples/widgets/painting/imagecomposition/imagecomposition.pro @@ -5,9 +5,7 @@ RESOURCES = imagecomposition.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/imagecomposition -sources.files = $$SOURCES $$HEADERS $$RESOURCES images *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/imagecomposition -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/painting/painterpaths/painterpaths.pro b/examples/widgets/painting/painterpaths/painterpaths.pro index 64635be53c..560e84a267 100644 --- a/examples/widgets/painting/painterpaths/painterpaths.pro +++ b/examples/widgets/painting/painterpaths/painterpaths.pro @@ -7,9 +7,7 @@ unix:!mac:!vxworks:!integrity:LIBS += -lm # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/painterpaths -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painterpaths.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/painterpaths -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/painting/painting.pro b/examples/widgets/painting/painting.pro index 99cb2397ff..145fcdd383 100644 --- a/examples/widgets/painting/painting.pro +++ b/examples/widgets/painting/painting.pro @@ -12,12 +12,6 @@ SUBDIRS = basicdrawing \ transformations \ fontsampler -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS painting.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting -INSTALLS += target sources - QT += widgets examples_affine.subdir = affine diff --git a/examples/widgets/painting/pathstroke/pathstroke.pro b/examples/widgets/painting/pathstroke/pathstroke.pro index 0249d5a7c3..197fe22024 100644 --- a/examples/widgets/painting/pathstroke/pathstroke.pro +++ b/examples/widgets/painting/pathstroke/pathstroke.pro @@ -15,7 +15,5 @@ QT += widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/pathstroke -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/pathstroke -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/painting/shared/shared.pro b/examples/widgets/painting/shared/shared.pro index db94e7aafd..2a71c7d487 100644 --- a/examples/widgets/painting/shared/shared.pro +++ b/examples/widgets/painting/shared/shared.pro @@ -24,11 +24,3 @@ HEADERS += \ hoverpoints.h RESOURCES += shared.qrc - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/shared -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.pri images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/shared -INSTALLS += sources - -!cross_compile:INSTALLS += target diff --git a/examples/widgets/painting/transformations/transformations.pro b/examples/widgets/painting/transformations/transformations.pro index 3d27957a59..72f42046db 100644 --- a/examples/widgets/painting/transformations/transformations.pro +++ b/examples/widgets/painting/transformations/transformations.pro @@ -6,8 +6,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/transformations -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS transformations.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/painting/transformations -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/richtext/calendar/calendar.pro b/examples/widgets/richtext/calendar/calendar.pro index eeeb2f9c2e..d98b08a368 100644 --- a/examples/widgets/richtext/calendar/calendar.pro +++ b/examples/widgets/richtext/calendar/calendar.pro @@ -4,8 +4,6 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/calendar -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS calendar.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/calendar -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/richtext/orderform/orderform.pro b/examples/widgets/richtext/orderform/orderform.pro index a44a3f082e..72ba3a1d25 100644 --- a/examples/widgets/richtext/orderform/orderform.pro +++ b/examples/widgets/richtext/orderform/orderform.pro @@ -6,9 +6,7 @@ SOURCES = detailsdialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/orderform -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS orderform.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/orderform -INSTALLS += target sources +INSTALLS += target QT += widgets !isEmpty(QT.printsupport.name): QT += printsupport diff --git a/examples/widgets/richtext/richtext.pro b/examples/widgets/richtext/richtext.pro index f8624e8b33..499733ecec 100644 --- a/examples/widgets/richtext/richtext.pro +++ b/examples/widgets/richtext/richtext.pro @@ -3,9 +3,3 @@ SUBDIRS = calendar \ orderform \ syntaxhighlighter \ textedit - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS richtext.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext -INSTALLS += target sources diff --git a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro index 5bb2cec8cd..e968c1168a 100644 --- a/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro +++ b/examples/widgets/richtext/syntaxhighlighter/syntaxhighlighter.pro @@ -6,9 +6,7 @@ SOURCES = highlighter.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/syntaxhighlighter -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS syntaxhighlighter.pro examples -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/syntaxhighlighter -INSTALLS += target sources +INSTALLS += target wince*: { diff --git a/examples/widgets/richtext/textedit/textedit.pro b/examples/widgets/richtext/textedit/textedit.pro index 35eaf8808c..a2090231c5 100644 --- a/examples/widgets/richtext/textedit/textedit.pro +++ b/examples/widgets/richtext/textedit/textedit.pro @@ -13,11 +13,11 @@ build_all:!build_pass { CONFIG += release } +EXAMPLE_FILES = textedit.qdoc + # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/textedit -sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/richtext/textedit -INSTALLS += target sources +INSTALLS += target QT += widgets !isEmpty(QT.printsupport.name): QT += printsupport diff --git a/examples/widgets/scroller/graphicsview/graphicsview.pro b/examples/widgets/scroller/graphicsview/graphicsview.pro index fdc009235b..07ad81922e 100644 --- a/examples/widgets/scroller/graphicsview/graphicsview.pro +++ b/examples/widgets/scroller/graphicsview/graphicsview.pro @@ -3,7 +3,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/scroller/graphicsview -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS graphicsview.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/scroller/graphicsview -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/scroller/scroller.pro b/examples/widgets/scroller/scroller.pro index bf4c64be6b..bac3f26554 100644 --- a/examples/widgets/scroller/scroller.pro +++ b/examples/widgets/scroller/scroller.pro @@ -1,7 +1,2 @@ TEMPLATE = subdirs SUBDIRS += graphicsview - -# install -sources.files = scroller.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/scroller -INSTALLS += sources diff --git a/examples/widgets/statemachine/eventtransitions/eventtransitions.pro b/examples/widgets/statemachine/eventtransitions/eventtransitions.pro index e6d6633de6..7b8ef26eb0 100644 --- a/examples/widgets/statemachine/eventtransitions/eventtransitions.pro +++ b/examples/widgets/statemachine/eventtransitions/eventtransitions.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/eventtransitions -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS eventtransitions.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/eventtransitions -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/statemachine/factorial/factorial.pro b/examples/widgets/statemachine/factorial/factorial.pro index cb3900dbb6..f200c738ba 100644 --- a/examples/widgets/statemachine/factorial/factorial.pro +++ b/examples/widgets/statemachine/factorial/factorial.pro @@ -6,8 +6,6 @@ SOURCES += main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/factorial -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS factorial.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/factorial -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/statemachine/pingpong/pingpong.pro b/examples/widgets/statemachine/pingpong/pingpong.pro index b0d90d1a91..7cc27a13f5 100644 --- a/examples/widgets/statemachine/pingpong/pingpong.pro +++ b/examples/widgets/statemachine/pingpong/pingpong.pro @@ -6,8 +6,6 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/pingpong -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS pingpong.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/pingpong -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/statemachine/rogue/rogue.pro b/examples/widgets/statemachine/rogue/rogue.pro index a2cbe16aa1..d1f4f5d972 100644 --- a/examples/widgets/statemachine/rogue/rogue.pro +++ b/examples/widgets/statemachine/rogue/rogue.pro @@ -5,9 +5,7 @@ SOURCES = main.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/rogue -sources.files = $$SOURCES $$HEADERS *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/rogue -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/statemachine/statemachine.pro b/examples/widgets/statemachine/statemachine.pro index cc471e731f..2a539d2e54 100644 --- a/examples/widgets/statemachine/statemachine.pro +++ b/examples/widgets/statemachine/statemachine.pro @@ -10,9 +10,3 @@ SUBDIRS = \ trafficlight \ twowaybutton } - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS statemachine.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine -INSTALLS += target sources diff --git a/examples/widgets/statemachine/trafficlight/trafficlight.pro b/examples/widgets/statemachine/trafficlight/trafficlight.pro index 0b61879e55..14d10f5a10 100644 --- a/examples/widgets/statemachine/trafficlight/trafficlight.pro +++ b/examples/widgets/statemachine/trafficlight/trafficlight.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/trafficlight -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS trafficlight.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/trafficlight -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/statemachine/twowaybutton/twowaybutton.pro b/examples/widgets/statemachine/twowaybutton/twowaybutton.pro index 46626d36de..9562df5919 100644 --- a/examples/widgets/statemachine/twowaybutton/twowaybutton.pro +++ b/examples/widgets/statemachine/twowaybutton/twowaybutton.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/twowaybutton -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS twowaybutton.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/statemachine/twowaybutton -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/codecs/codecs.pro b/examples/widgets/tools/codecs/codecs.pro index 377dfaa8c9..410411d870 100644 --- a/examples/widgets/tools/codecs/codecs.pro +++ b/examples/widgets/tools/codecs/codecs.pro @@ -4,11 +4,11 @@ SOURCES += main.cpp \ mainwindow.cpp \ previewform.cpp +EXAMPLE_FILES = encodedfiles + # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/codecs -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS encodedfiles codecs.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/codecs -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/completer/completer.pro b/examples/widgets/tools/completer/completer.pro index a735b7ceae..c0fcf8d1fb 100644 --- a/examples/widgets/tools/completer/completer.pro +++ b/examples/widgets/tools/completer/completer.pro @@ -7,9 +7,7 @@ RESOURCES = completer.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/completer -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS completer.pro resources -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/completer -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/customcompleter/customcompleter.pro b/examples/widgets/tools/customcompleter/customcompleter.pro index b61cb510e9..24d973cf82 100644 --- a/examples/widgets/tools/customcompleter/customcompleter.pro +++ b/examples/widgets/tools/customcompleter/customcompleter.pro @@ -7,9 +7,7 @@ RESOURCES = customcompleter.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS customcompleter.pro resources -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/customcompleter -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/echoplugin/echoplugin.pro b/examples/widgets/tools/echoplugin/echoplugin.pro index ffd48fd25f..685227c6c4 100644 --- a/examples/widgets/tools/echoplugin/echoplugin.pro +++ b/examples/widgets/tools/echoplugin/echoplugin.pro @@ -6,8 +6,6 @@ SUBDIRS = echowindow \ # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echoplugin.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro index 90bc831de1..cd91693ec0 100644 --- a/examples/widgets/tools/echoplugin/echowindow/echowindow.pro +++ b/examples/widgets/tools/echoplugin/echowindow/echowindow.pro @@ -14,9 +14,7 @@ win32 { # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS echowindow.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/echowindow -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/echoplugin/plugin/plugin.pro b/examples/widgets/tools/echoplugin/plugin/plugin.pro index 532a382586..a586130b76 100644 --- a/examples/widgets/tools/echoplugin/plugin/plugin.pro +++ b/examples/widgets/tools/echoplugin/plugin/plugin.pro @@ -4,15 +4,14 @@ CONFIG += plugin INCLUDEPATH += ../echowindow HEADERS = echoplugin.h SOURCES = echoplugin.cpp -OTHER_FILES += echoplugin.json TARGET = $$qtLibraryTarget(echoplugin) DESTDIR = ../plugins #! [0] +EXAMPLE_FILES = echoplugin.json + # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/plugin -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro echoplugin.json -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/echoplugin/plugin -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/i18n/i18n.pro b/examples/widgets/tools/i18n/i18n.pro index a02e25dcd0..57514781eb 100644 --- a/examples/widgets/tools/i18n/i18n.pro +++ b/examples/widgets/tools/i18n/i18n.pro @@ -21,9 +21,7 @@ TRANSLATIONS += translations/i18n_ar.ts \ # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/i18n -sources.files = $$SOURCES $$HEADERS $$RESOURCES translations i18n.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/i18n -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/plugandpaint/plugandpaint.pro b/examples/widgets/tools/plugandpaint/plugandpaint.pro index cbf573dd4b..ffa408df66 100644 --- a/examples/widgets/tools/plugandpaint/plugandpaint.pro +++ b/examples/widgets/tools/plugandpaint/plugandpaint.pro @@ -18,8 +18,6 @@ if(!debug_and_release|build_pass):CONFIG(debug, debug|release) { # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugandpaint.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro b/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro index 3190e45c46..731034fb3c 100644 --- a/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro +++ b/examples/widgets/tools/plugandpaintplugins/basictools/basictools.pro @@ -4,15 +4,12 @@ CONFIG += plugin static INCLUDEPATH += ../.. HEADERS = basictoolsplugin.h SOURCES = basictoolsplugin.cpp -OTHER_FILES += basictools.json TARGET = $$qtLibraryTarget(pnp_basictools) DESTDIR = ../../plugandpaint/plugins #! [0] # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint/plugins -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS basictools.pro basictools.json -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins/basictools -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro b/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro index bc7ccffc0a..7a18e49dc1 100644 --- a/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro +++ b/examples/widgets/tools/plugandpaintplugins/extrafilters/extrafilters.pro @@ -4,16 +4,12 @@ CONFIG += plugin INCLUDEPATH += ../.. HEADERS = extrafiltersplugin.h SOURCES = extrafiltersplugin.cpp -OTHER_FILES += extrafilters.json TARGET = $$qtLibraryTarget(pnp_extrafilters) DESTDIR = ../../plugandpaint/plugins #! [0] # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaint/plugins -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS extrafilters.pro extrafilters.json -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins/extrafilters -INSTALLS += target sources - +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/plugandpaintplugins/plugandpaintplugins.pro b/examples/widgets/tools/plugandpaintplugins/plugandpaintplugins.pro index 8eab48e92d..6f077c952e 100644 --- a/examples/widgets/tools/plugandpaintplugins/plugandpaintplugins.pro +++ b/examples/widgets/tools/plugandpaintplugins/plugandpaintplugins.pro @@ -2,10 +2,4 @@ TEMPLATE = subdirs SUBDIRS = basictools \ extrafilters -# install -target.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugandpaintplugins.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/plugandpaintplugins -INSTALLS += target sources - QT += widgets diff --git a/examples/widgets/tools/regexp/regexp.pro b/examples/widgets/tools/regexp/regexp.pro index 8e88511ead..eead58807f 100644 --- a/examples/widgets/tools/regexp/regexp.pro +++ b/examples/widgets/tools/regexp/regexp.pro @@ -4,9 +4,7 @@ SOURCES = regexpdialog.cpp \ # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/regexp -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS regexp.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/regexp -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/settingseditor/settingseditor.pro b/examples/widgets/tools/settingseditor/settingseditor.pro index 2499b22436..9d7c776067 100644 --- a/examples/widgets/tools/settingseditor/settingseditor.pro +++ b/examples/widgets/tools/settingseditor/settingseditor.pro @@ -8,11 +8,11 @@ SOURCES = locationdialog.cpp \ settingstree.cpp \ variantdelegate.cpp +EXAMPLE_FILES = inifiles + # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/settingseditor -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS settingseditor.pro inifiles -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/settingseditor -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/styleplugin/plugin/plugin.pro b/examples/widgets/tools/styleplugin/plugin/plugin.pro index c13af5a36c..65a41087e6 100644 --- a/examples/widgets/tools/styleplugin/plugin/plugin.pro +++ b/examples/widgets/tools/styleplugin/plugin/plugin.pro @@ -5,7 +5,6 @@ HEADERS = simplestyle.h \ simplestyleplugin.h SOURCES = simplestyle.cpp \ simplestyleplugin.cpp -OTHER_FILES += simplestyle.json TARGET = simplestyleplugin #! [0] win32 { @@ -15,11 +14,11 @@ win32 { DESTDIR = ../styles/ } +EXAMPLE_FILES += simplestyle.json + # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/styles -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS plugin.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/plugin -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/styleplugin/styleplugin.pro b/examples/widgets/tools/styleplugin/styleplugin.pro index 63805a14cc..4df48ae6b4 100644 --- a/examples/widgets/tools/styleplugin/styleplugin.pro +++ b/examples/widgets/tools/styleplugin/styleplugin.pro @@ -4,8 +4,6 @@ SUBDIRS = stylewindow \ # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS styleplugin.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro index 658a46134b..3bfcf23bbb 100644 --- a/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro +++ b/examples/widgets/tools/styleplugin/stylewindow/stylewindow.pro @@ -12,8 +12,6 @@ win32 { # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS stylewindow.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/styleplugin/stylewindow -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro index ffdf9b647d..818f242b48 100644 --- a/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro +++ b/examples/widgets/tools/treemodelcompleter/treemodelcompleter.pro @@ -7,9 +7,7 @@ RESOURCES = treemodelcompleter.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/treemodelcompleter -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS treemodelcompleter.pro resources -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/treemodelcompleter -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/undo/undo.pro b/examples/widgets/tools/undo/undo.pro index e61b678a93..f3ac1256c0 100644 --- a/examples/widgets/tools/undo/undo.pro +++ b/examples/widgets/tools/undo/undo.pro @@ -11,8 +11,6 @@ RESOURCES += undo.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/undo -sources.files = $$SOURCES $$HEADERS *.pro icons $$RESOURCES $$FORMS -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/undo -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tools/undoframework/undoframework.pro b/examples/widgets/tools/undoframework/undoframework.pro index d50247442a..a9a1b05f39 100644 --- a/examples/widgets/tools/undoframework/undoframework.pro +++ b/examples/widgets/tools/undoframework/undoframework.pro @@ -11,9 +11,7 @@ RESOURCES = undoframework.qrc # install target.path = $$[QT_INSTALL_EXAMPLES]/tools/undoframework -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS undoframework.pro README images -sources.path = $$[QT_INSTALL_EXAMPLES]/tools/undoframework -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro b/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro index 8db6a819a8..50e6e55ac8 100644 --- a/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro +++ b/examples/widgets/tutorials/addressbook-fr/addressbook-fr.pro @@ -3,8 +3,6 @@ SUBDIRS = part1 part2 part3 part4 part5 part6 part7 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook-fr.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part1/part1.pro b/examples/widgets/tutorials/addressbook-fr/part1/part1.pro index 08a870a77e..b82f294ed6 100644 --- a/examples/widgets/tutorials/addressbook-fr/part1/part1.pro +++ b/examples/widgets/tutorials/addressbook-fr/part1/part1.pro @@ -6,9 +6,7 @@ QMAKE_PROJECT_NAME = abfr_part1 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part1 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part1 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part2/part2.pro b/examples/widgets/tutorials/addressbook-fr/part2/part2.pro index 34408264c2..1ebe545e85 100644 --- a/examples/widgets/tutorials/addressbook-fr/part2/part2.pro +++ b/examples/widgets/tutorials/addressbook-fr/part2/part2.pro @@ -6,9 +6,7 @@ QMAKE_PROJECT_NAME = abfr_part2 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part2 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part2 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part3/part3.pro b/examples/widgets/tutorials/addressbook-fr/part3/part3.pro index a2fb6c5fca..04c8417cbe 100644 --- a/examples/widgets/tutorials/addressbook-fr/part3/part3.pro +++ b/examples/widgets/tutorials/addressbook-fr/part3/part3.pro @@ -6,9 +6,7 @@ QMAKE_PROJECT_NAME = abfr_part3 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part3 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part3 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part4/part4.pro b/examples/widgets/tutorials/addressbook-fr/part4/part4.pro index 68705fc807..02fdecf210 100644 --- a/examples/widgets/tutorials/addressbook-fr/part4/part4.pro +++ b/examples/widgets/tutorials/addressbook-fr/part4/part4.pro @@ -6,9 +6,7 @@ QMAKE_PROJECT_NAME = abfr_part4 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part4 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part4 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part5/part5.pro b/examples/widgets/tutorials/addressbook-fr/part5/part5.pro index fcaf3fc66f..20b9549037 100644 --- a/examples/widgets/tutorials/addressbook-fr/part5/part5.pro +++ b/examples/widgets/tutorials/addressbook-fr/part5/part5.pro @@ -8,9 +8,7 @@ QMAKE_PROJECT_NAME = abfr_part5 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part5 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part5 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part6/part6.pro b/examples/widgets/tutorials/addressbook-fr/part6/part6.pro index 34bcb8f8fc..098daca36a 100644 --- a/examples/widgets/tutorials/addressbook-fr/part6/part6.pro +++ b/examples/widgets/tutorials/addressbook-fr/part6/part6.pro @@ -8,9 +8,7 @@ QMAKE_PROJECT_NAME = abfr_part6 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part6 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part6 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook-fr/part7/part7.pro b/examples/widgets/tutorials/addressbook-fr/part7/part7.pro index e0981a7da9..5c1dd33d06 100644 --- a/examples/widgets/tutorials/addressbook-fr/part7/part7.pro +++ b/examples/widgets/tutorials/addressbook-fr/part7/part7.pro @@ -8,9 +8,7 @@ QMAKE_PROJECT_NAME = abfr_part7 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part7 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook-fr/part7 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook/addressbook.pro b/examples/widgets/tutorials/addressbook/addressbook.pro index 80bc073e71..5dd9da5c01 100644 --- a/examples/widgets/tutorials/addressbook/addressbook.pro +++ b/examples/widgets/tutorials/addressbook/addressbook.pro @@ -3,8 +3,6 @@ SUBDIRS = part1 part2 part3 part4 part5 part6 part7 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS addressbook.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part1/part1.pro b/examples/widgets/tutorials/addressbook/part1/part1.pro index e8722df318..82746da8e5 100644 --- a/examples/widgets/tutorials/addressbook/part1/part1.pro +++ b/examples/widgets/tutorials/addressbook/part1/part1.pro @@ -6,9 +6,7 @@ QMAKE_PROJECT_NAME = ab_part1 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part1 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part1.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part1 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part2/part2.pro b/examples/widgets/tutorials/addressbook/part2/part2.pro index 65247f3e61..439b9185a6 100644 --- a/examples/widgets/tutorials/addressbook/part2/part2.pro +++ b/examples/widgets/tutorials/addressbook/part2/part2.pro @@ -6,9 +6,7 @@ QMAKE_PROJECT_NAME = ab_part2 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part2 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part2.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part2 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part3/part3.pro b/examples/widgets/tutorials/addressbook/part3/part3.pro index 79cf2da551..fd32f00536 100644 --- a/examples/widgets/tutorials/addressbook/part3/part3.pro +++ b/examples/widgets/tutorials/addressbook/part3/part3.pro @@ -6,9 +6,7 @@ QMAKE_PROJECT_NAME = ab_part3 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part3 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part3.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part3 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part4/part4.pro b/examples/widgets/tutorials/addressbook/part4/part4.pro index 61ceb90802..c5caaa87c1 100644 --- a/examples/widgets/tutorials/addressbook/part4/part4.pro +++ b/examples/widgets/tutorials/addressbook/part4/part4.pro @@ -6,9 +6,7 @@ QMAKE_PROJECT_NAME = ab_part4 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part4 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part4.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part4 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part5/part5.pro b/examples/widgets/tutorials/addressbook/part5/part5.pro index 8f42a07025..e779ad5024 100644 --- a/examples/widgets/tutorials/addressbook/part5/part5.pro +++ b/examples/widgets/tutorials/addressbook/part5/part5.pro @@ -8,9 +8,7 @@ QMAKE_PROJECT_NAME = ab_part5 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part5 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part5.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part5 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part6/part6.pro b/examples/widgets/tutorials/addressbook/part6/part6.pro index f7a958cf97..dd652985ad 100644 --- a/examples/widgets/tutorials/addressbook/part6/part6.pro +++ b/examples/widgets/tutorials/addressbook/part6/part6.pro @@ -8,9 +8,7 @@ QMAKE_PROJECT_NAME = ab_part6 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part6 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part6.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part6 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/addressbook/part7/part7.pro b/examples/widgets/tutorials/addressbook/part7/part7.pro index 90fc0ca229..d63690ee11 100644 --- a/examples/widgets/tutorials/addressbook/part7/part7.pro +++ b/examples/widgets/tutorials/addressbook/part7/part7.pro @@ -8,9 +8,7 @@ QMAKE_PROJECT_NAME = ab_part7 # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part7 -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS part7.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/addressbook/part7 -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/gettingStarted/gettingStarted.pro b/examples/widgets/tutorials/gettingStarted/gettingStarted.pro index 98a834f5f6..b18e6565a6 100644 --- a/examples/widgets/tutorials/gettingStarted/gettingStarted.pro +++ b/examples/widgets/tutorials/gettingStarted/gettingStarted.pro @@ -3,8 +3,3 @@ SUBDIRS += dir_gsqt QT += widgets dir_gsqt.file = gsQt/gsqt.pro - -# install -sources.files = gettingStarted.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted -INSTALLS += sources diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro b/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro index 4a0604fc3f..956d78aa6e 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/gsqt.pro @@ -6,9 +6,4 @@ SUBDIRS = part1 \ part4 \ part5 -# install -sources.files = *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt -INSTALLS += sources - QT += widgets diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro index e6eb0d45f2..391606bfd7 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part1/part1.pro @@ -4,7 +4,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part1 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part1 -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro index c3f30e5810..e7422e4a31 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part2/part2.pro @@ -4,7 +4,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part2 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part2 -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro index f51e531cbd..1577848de5 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part3/part3.pro @@ -4,7 +4,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part3 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part3 -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro index 5221bda09d..086fac69e9 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part4/part4.pro @@ -4,7 +4,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part4 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part4 -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro b/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro index a3687aa4b2..032f220b83 100644 --- a/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro +++ b/examples/widgets/tutorials/gettingStarted/gsQt/part5/part5.pro @@ -4,7 +4,5 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part5 -sources.files = $$SOURCES *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/gettingStarted/gsQt/part5 -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro b/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro index 4aa8ed1039..cf066c6b31 100644 --- a/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro +++ b/examples/widgets/tutorials/modelview/1_readonly/1_readonly.pro @@ -10,9 +10,7 @@ HEADERS += mymodel.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/1_readonly -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 1_readonly.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/1_readonly -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro b/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro index 668b2570cf..057196b7c6 100644 --- a/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro +++ b/examples/widgets/tutorials/modelview/2_formatting/2_formatting.pro @@ -9,9 +9,7 @@ HEADERS += mymodel.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/2_formatting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 2_formatting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/2_formatting -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro b/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro index 8993d7149b..92a1bbf4e5 100644 --- a/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro +++ b/examples/widgets/tutorials/modelview/3_changingmodel/3_changingmodel.pro @@ -9,9 +9,7 @@ HEADERS += mymodel.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/3_changingmodel -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 3_changingmodel.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/3_changingmodel -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/4_headers/4_headers.pro b/examples/widgets/tutorials/modelview/4_headers/4_headers.pro index a343b63fdb..186ea888e0 100644 --- a/examples/widgets/tutorials/modelview/4_headers/4_headers.pro +++ b/examples/widgets/tutorials/modelview/4_headers/4_headers.pro @@ -9,9 +9,7 @@ HEADERS += mymodel.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/4_headers -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 4_headers.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/4_headers -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/5_edit/5_edit.pro b/examples/widgets/tutorials/modelview/5_edit/5_edit.pro index cea272439e..b4727580af 100644 --- a/examples/widgets/tutorials/modelview/5_edit/5_edit.pro +++ b/examples/widgets/tutorials/modelview/5_edit/5_edit.pro @@ -11,9 +11,7 @@ HEADERS += mainwindow.h \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/5_edit -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 5_edit.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/5_edit -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro b/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro index 1e35d6cd67..af3208f9c8 100644 --- a/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro +++ b/examples/widgets/tutorials/modelview/6_treeview/6_treeview.pro @@ -6,9 +6,7 @@ HEADERS += mainwindow.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/6_treeview -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 6_treeview.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/6_treeview -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/7_selections/7_selections.pro b/examples/widgets/tutorials/modelview/7_selections/7_selections.pro index f3eaac0a7d..8ab42e97ef 100644 --- a/examples/widgets/tutorials/modelview/7_selections/7_selections.pro +++ b/examples/widgets/tutorials/modelview/7_selections/7_selections.pro @@ -6,9 +6,7 @@ HEADERS += mainwindow.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/7_selections -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS 7_selections.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview/7_selections -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/modelview/modelview.pro b/examples/widgets/tutorials/modelview/modelview.pro index 2d6460fc4d..b21fe5afdc 100644 --- a/examples/widgets/tutorials/modelview/modelview.pro +++ b/examples/widgets/tutorials/modelview/modelview.pro @@ -9,8 +9,6 @@ SUBDIRS = 1_readonly \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS modelview.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/modelview -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/threads/clock/clock.pro b/examples/widgets/tutorials/threads/clock/clock.pro index 833781b36a..9d2687324b 100644 --- a/examples/widgets/tutorials/threads/clock/clock.pro +++ b/examples/widgets/tutorials/threads/clock/clock.pro @@ -6,9 +6,7 @@ HEADERS += clockthread.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/clock -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS clock.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/clock -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro b/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro index 794c095aa0..7e6da1133c 100644 --- a/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro +++ b/examples/widgets/tutorials/threads/helloconcurrent/helloconcurrent.pro @@ -8,9 +8,7 @@ SOURCES += helloconcurrent.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/helloconcurrent -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS helloconcurrent.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/helloconcurrent -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/threads/hellothread/hellothread.pro b/examples/widgets/tutorials/threads/hellothread/hellothread.pro index 8bc14d09c3..40fd33b146 100644 --- a/examples/widgets/tutorials/threads/hellothread/hellothread.pro +++ b/examples/widgets/tutorials/threads/hellothread/hellothread.pro @@ -9,8 +9,6 @@ HEADERS += hellothread.h # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/hellothread -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothread.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/hellothread -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro b/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro index 6e60fd14bc..d5404a5134 100644 --- a/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro +++ b/examples/widgets/tutorials/threads/hellothreadpool/hellothreadpool.pro @@ -7,9 +7,7 @@ SOURCES += hellothreadpool.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/hellothreadpool -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS hellothreadpool.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/hellothreadpool -INSTALLS += target sources +INSTALLS += target diff --git a/examples/widgets/tutorials/threads/movedobject/movedobject.pro b/examples/widgets/tutorials/threads/movedobject/movedobject.pro index 5037b37369..3bf40eb49c 100644 --- a/examples/widgets/tutorials/threads/movedobject/movedobject.pro +++ b/examples/widgets/tutorials/threads/movedobject/movedobject.pro @@ -11,8 +11,6 @@ HEADERS += \ # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/movedobject -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS movedobject.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads/movedobject -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/threads/threads.pro b/examples/widgets/tutorials/threads/threads.pro index fd26fae6f7..a95eccaaa0 100644 --- a/examples/widgets/tutorials/threads/threads.pro +++ b/examples/widgets/tutorials/threads/threads.pro @@ -8,8 +8,3 @@ SUBDIRS = hellothread \ contains(QT_CONFIG, concurrent): SUBDIRS += helloconcurrent QT += widgets - -# install -sources.files = threads.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/threads -INSTALLS += sources diff --git a/examples/widgets/tutorials/tutorials.pro b/examples/widgets/tutorials/tutorials.pro index 144dffa631..cb57002082 100644 --- a/examples/widgets/tutorials/tutorials.pro +++ b/examples/widgets/tutorials/tutorials.pro @@ -1,8 +1,2 @@ TEMPLATE = subdirs SUBDIRS += addressbook-fr threads addressbook widgets modelview gettingStarted - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials -sources.files = tutorials.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials -INSTALLS += target sources diff --git a/examples/widgets/tutorials/widgets/childwidget/childwidget.pro b/examples/widgets/tutorials/widgets/childwidget/childwidget.pro index 6f04e9582e..4eeab61be5 100644 --- a/examples/widgets/tutorials/widgets/childwidget/childwidget.pro +++ b/examples/widgets/tutorials/widgets/childwidget/childwidget.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/childwidget -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS childwidget.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/childwidget -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro b/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro index 2655559435..e362f16713 100644 --- a/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro +++ b/examples/widgets/tutorials/widgets/nestedlayouts/nestedlayouts.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/nestedlayouts -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS nestedlayouts.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/nestedlayouts -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/widgets/toplevel/toplevel.pro b/examples/widgets/tutorials/widgets/toplevel/toplevel.pro index fd2506612c..faa91eb0dd 100644 --- a/examples/widgets/tutorials/widgets/toplevel/toplevel.pro +++ b/examples/widgets/tutorials/widgets/toplevel/toplevel.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/toplevel -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS toplevel.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/toplevel -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/widgets/widgets.pro b/examples/widgets/tutorials/widgets/widgets.pro index 318453e5a7..41cfa1d7f6 100644 --- a/examples/widgets/tutorials/widgets/widgets.pro +++ b/examples/widgets/tutorials/widgets/widgets.pro @@ -3,7 +3,5 @@ SUBDIRS = toplevel childwidget windowlayout nestedlayouts # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS widgets.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro b/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro index d87f7780f1..6fd115591e 100644 --- a/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro +++ b/examples/widgets/tutorials/widgets/windowlayout/windowlayout.pro @@ -2,9 +2,7 @@ SOURCES = main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/windowlayout -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS windowlayout.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets/tutorials/widgets/windowlayout -INSTALLS += target sources +INSTALLS += target QT += widgets diff --git a/examples/widgets/widgets.pro b/examples/widgets/widgets.pro index d6d86dd3a6..bdac0bde28 100644 --- a/examples/widgets/widgets.pro +++ b/examples/widgets/widgets.pro @@ -20,8 +20,3 @@ SUBDIRS = \ widgets contains(DEFINES, QT_NO_CURSOR): SUBDIRS -= mainwindows - -# install -sources.files = *.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/widgets -INSTALLS += sources 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 diff --git a/examples/xml/dombookmarks/dombookmarks.pro b/examples/xml/dombookmarks/dombookmarks.pro index 42fdb17137..93a5fb9ac9 100644 --- a/examples/xml/dombookmarks/dombookmarks.pro +++ b/examples/xml/dombookmarks/dombookmarks.pro @@ -5,11 +5,11 @@ SOURCES = main.cpp \ xbeltree.cpp QT += xml widgets +EXAMPLE_FILES = frank.xbel jennifer.xbel + # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS dombookmarks.pro *.xbel -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/dombookmarks -INSTALLS += target sources +INSTALLS += target wince*: { addFiles.files = frank.xbel jennifer.xbel diff --git a/examples/xml/htmlinfo/htmlinfo.pro b/examples/xml/htmlinfo/htmlinfo.pro index 503ff4060b..9e58973db6 100644 --- a/examples/xml/htmlinfo/htmlinfo.pro +++ b/examples/xml/htmlinfo/htmlinfo.pro @@ -14,6 +14,4 @@ wince*:{ # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.html htmlinfo.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/htmlinfo -INSTALLS += target sources +INSTALLS += target diff --git a/examples/xml/rsslisting/rsslisting.pro b/examples/xml/rsslisting/rsslisting.pro index 0cbf2437f8..5997f96ca9 100644 --- a/examples/xml/rsslisting/rsslisting.pro +++ b/examples/xml/rsslisting/rsslisting.pro @@ -4,6 +4,4 @@ QT += network xml widgets # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/rsslisting -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS rsslisting.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/rsslisting -INSTALLS += target sources +INSTALLS += target diff --git a/examples/xml/saxbookmarks/saxbookmarks.pro b/examples/xml/saxbookmarks/saxbookmarks.pro index cf9cc140bb..6723b0c6fc 100644 --- a/examples/xml/saxbookmarks/saxbookmarks.pro +++ b/examples/xml/saxbookmarks/saxbookmarks.pro @@ -7,11 +7,11 @@ SOURCES = main.cpp \ xbelhandler.cpp QT += xml widgets +EXAMPLE_FILES = frank.xbel jennifer.xbel + # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS saxbookmarks.pro *.xbel -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/saxbookmarks -INSTALLS += target sources +INSTALLS += target wince*: { addFiles.files = frank.xbel jennifer.xbel diff --git a/examples/xml/streambookmarks/streambookmarks.pro b/examples/xml/streambookmarks/streambookmarks.pro index 27d84ae68b..62aac0eef3 100644 --- a/examples/xml/streambookmarks/streambookmarks.pro +++ b/examples/xml/streambookmarks/streambookmarks.pro @@ -7,8 +7,8 @@ SOURCES = main.cpp \ xbelwriter.cpp QT += xml widgets +EXAMPLE_FILES = frank.xbel jennifer.xbel + # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/streambookmarks -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS streambookmarks.pro *.xbel -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/streambookmarks -INSTALLS += target sources +INSTALLS += target diff --git a/examples/xml/xml.pro b/examples/xml/xml.pro index 739ada31c7..7c7b6f7456 100644 --- a/examples/xml/xml.pro +++ b/examples/xml/xml.pro @@ -8,10 +8,3 @@ SUBDIRS = htmlinfo \ saxbookmarks \ streambookmarks } - - -# install -target.path = $$[QT_INSTALL_EXAMPLES]/xml -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xml.pro README -sources.path = $$[QT_INSTALL_EXAMPLES]/xml -INSTALLS += target sources diff --git a/examples/xml/xmlstreamlint/xmlstreamlint.pro b/examples/xml/xmlstreamlint/xmlstreamlint.pro index d237740eff..295db2bc31 100644 --- a/examples/xml/xmlstreamlint/xmlstreamlint.pro +++ b/examples/xml/xmlstreamlint/xmlstreamlint.pro @@ -6,9 +6,7 @@ SOURCES += main.cpp # install target.path = $$[QT_INSTALL_EXAMPLES]/xml/xmlstreamlint -sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS xmlstreamlint.pro -sources.path = $$[QT_INSTALL_EXAMPLES]/xml/xmlstreamlint -INSTALLS += target sources +INSTALLS += target simulator: warning(This example does not work on Simulator platform) diff --git a/mkspecs/features/qt_build_config.prf b/mkspecs/features/qt_build_config.prf index df07630ffa..63d6b43c7c 100644 --- a/mkspecs/features/qt_build_config.prf +++ b/mkspecs/features/qt_build_config.prf @@ -28,6 +28,7 @@ mac { CONFIG += \ create_prl link_prl \ prepare_docs qt_docs_targets \ + qt_example_installs \ no_private_qt_headers_warning QTDIR_build \ # Qt modules get compiled without exceptions enabled by default. # However, testcases should be still built with exceptions. diff --git a/mkspecs/features/qt_example_installs.prf b/mkspecs/features/qt_example_installs.prf new file mode 100644 index 0000000000..72f0b141a7 --- /dev/null +++ b/mkspecs/features/qt_example_installs.prf @@ -0,0 +1,71 @@ +probase = $$relative_path($$_PRO_FILE_PWD_, $$dirname(_QMAKE_CONF_)/examples) +!contains(probase, ^\\..*) { + for(ex, EXAMPLE_FILES): \ + sourcefiles += $$files($$absolute_path($$ex, $$_PRO_FILE_PWD_)) + for(res, RESOURCES) { + rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines) + for(rline, rfile) { + resrc = $$replace(rline, ^[ \\t]*<file[^>]*>([^<]+)</file>[ \\t]*$, \\1) + !equals(resrc, $$rline): \ + sourcefiles += $$resrc + } + } + for(res, RC_FILE) { + rfile = $$cat($$absolute_path($$res, $$_PRO_FILE_PWD_), lines) + for(rline, rfile) { + resrc = $$replace(rline, "^\\d+\\s+ICON\\s+[^\"]*\"([^\"]+)\"\$", \\1) + !equals(resrc, $$rline): \ + sourcefiles += $$resrc + } + } + extras = \ + $$_PRO_FILE_PWD_/README \ + $$files($$_PRO_FILE_PWD_/*.pri) \ + $$replace(_PRO_FILE_, \\.pro$, .json) \ + $$replace(_PRO_FILE_, \\.pro$, .inf) + for(extra, extras): \ + exists($$extra): \ + sourcefiles += $$extra + + # Just for Qt Creator + OTHER_FILES += $$sourcefiles + + sourcefiles += \ + $$_PRO_FILE_ $$RC_FILE $$DEF_FILE \ + $$SOURCES $$HEADERS $$FORMS $$RESOURCES $$TRANSLATIONS \ + $$DBUS_ADAPTORS $$DBUS_INTERFACES + for(sf, sourcefiles) { + sf = $$relative_path($$sf, $$_PRO_FILE_PWD_) + contains(sf, \\..*) { + check_examples: message("Notice: $$_PRO_FILE_ refers to $$sf") + } else { + sfp = $$replace(sf, /.*, ) + !equals(sfp, $$sf): \ + sources.files *= $$sfp + else: \ + sources.files += $$sf + } + } + sources.path = $$[QT_INSTALL_EXAMPLES]/$$probase + INSTALLS += sources + + check_examples { + thefiles = $$files($$_PRO_FILE_PWD_/*) + for(i, thefiles): \ + allfiles += $$relative_path($$i, $$_PRO_FILE_PWD_) + for(i, sources.files): \ + allfiles -= $$relative_path($$i, $$_PRO_FILE_PWD_) + for(i, SUBDIRS) { + sd = $$eval($${i}.file) + !isEmpty(sd) { + sd ~= s,/.*,, + } else { + sd = $$eval($${i}.subdir) + isEmpty(sd): sd = $$i + } + allfiles -= $$sd + } + allfiles -= doc + !isEmpty(allfiles): warning("remaining files in $$_PRO_FILE_PWD_: $$allfiles") + } +} |