From aeb036ed8715d0c099d3dca87f7def4dbaf8e9b4 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 27 Nov 2012 20:40:16 +0100 Subject: centralize and fixup example sources install targets it's confusing for the users if the examples' project files contain code to install their own sources. also, this constitutes an enormous code duplication, and lots of mistakes. consequently, automate it. more or less as a side effect, this also removes the entirely meaningless target installs in subdirs projects. Task-number: QTBUG-28184 Change-Id: I9fc1367a06db9e2c46aeb67d68729a4f67163ef9 Reviewed-by: hjk --- examples/embedded/digiflip/digiflip.pro | 4 +--- examples/embedded/embedded.pro | 5 ----- examples/embedded/flickable/flickable.pro | 4 +--- examples/embedded/flightinfo/flightinfo.pro | 4 +--- examples/embedded/lightmaps/lightmaps.pro | 4 +--- examples/embedded/raycasting/raycasting.pro | 4 +--- examples/embedded/styleexample/styleexample.pro | 4 +--- 7 files changed, 6 insertions(+), 23 deletions(-) (limited to 'examples/embedded') 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 -- cgit v1.2.3