summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-11-28 16:06:45 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-28 22:15:49 +0100
commit9c21f30a62dfd37d4488d10dc3c652d9b0237030 (patch)
treec85b62e338c11948e1a5ac13d8f59321bf811281
parentb13381ded17ce65bb9bad783a987afe1102b90e6 (diff)
centralize and fixup example sources install targets
follow respective change in qtbase Change-Id: I6e892deb9fa3868579e9c556fbcf00cc7bc6145c Reviewed-by: hjk <qthjk@ovi.com>
-rw-r--r--examples/designer/arthurplugin/arthurplugin.pro5
-rw-r--r--examples/designer/calculatorbuilder/calculatorbuilder.pro4
-rw-r--r--examples/designer/calculatorform/calculatorform.pro4
-rw-r--r--examples/designer/containerextension/containerextension.pro6
-rw-r--r--examples/designer/customwidgetplugin/customwidgetplugin.pro5
-rw-r--r--examples/designer/designer.pro6
-rw-r--r--examples/designer/taskmenuextension/taskmenuextension.pro5
-rw-r--r--examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro4
-rw-r--r--examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro5
-rw-r--r--examples/help/contextsensitivehelp/contextsensitivehelp.pro4
-rw-r--r--examples/help/help.pro5
-rw-r--r--examples/help/remotecontrol/remotecontrol.pro4
-rw-r--r--examples/help/simpletextviewer/simpletextviewer.pro4
-rw-r--r--examples/uitools/multipleinheritance/multipleinheritance.pro4
-rw-r--r--examples/uitools/textfinder/textfinder.pro4
-rw-r--r--examples/uitools/uitools.pro6
16 files changed, 8 insertions, 67 deletions
diff --git a/examples/designer/arthurplugin/arthurplugin.pro b/examples/designer/arthurplugin/arthurplugin.pro
index d7d05f0a1..57cfd3602 100644
--- a/examples/designer/arthurplugin/arthurplugin.pro
+++ b/examples/designer/arthurplugin/arthurplugin.pro
@@ -51,11 +51,6 @@ HEADERS = \
RESOURCES += arthur_plugin.qrc
-# install
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.jpg *.png
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/arthurplugin
-INSTALLS += sources
-
win32-msvc* {
QMAKE_CFLAGS += /Zm500
QMAKE_CXXFLAGS += /Zm500
diff --git a/examples/designer/calculatorbuilder/calculatorbuilder.pro b/examples/designer/calculatorbuilder/calculatorbuilder.pro
index 98e348619..4294a8a04 100644
--- a/examples/designer/calculatorbuilder/calculatorbuilder.pro
+++ b/examples/designer/calculatorbuilder/calculatorbuilder.pro
@@ -8,6 +8,4 @@ QT += widgets uitools
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorbuilder
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.ui *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorbuilder
-INSTALLS += target sources
+INSTALLS += target
diff --git a/examples/designer/calculatorform/calculatorform.pro b/examples/designer/calculatorform/calculatorform.pro
index e7cbf98f6..9d3c635cb 100644
--- a/examples/designer/calculatorform/calculatorform.pro
+++ b/examples/designer/calculatorform/calculatorform.pro
@@ -9,6 +9,4 @@ QT += widgets
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorform
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/calculatorform
-INSTALLS += target sources
+INSTALLS += target
diff --git a/examples/designer/containerextension/containerextension.pro b/examples/designer/containerextension/containerextension.pro
index 524b05b85..0c78c97a2 100644
--- a/examples/designer/containerextension/containerextension.pro
+++ b/examples/designer/containerextension/containerextension.pro
@@ -34,9 +34,3 @@ SOURCES += multipagewidget.cpp \
OTHER_FILES += multipagewidget.json
#! [2]
-
-# install
-sources.files = $$SOURCES $$HEADERS *.pro multipagewidget.json
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/containerextension
-INSTALLS += sources
-
diff --git a/examples/designer/customwidgetplugin/customwidgetplugin.pro b/examples/designer/customwidgetplugin/customwidgetplugin.pro
index ffcee4ef2..fd0ef616a 100644
--- a/examples/designer/customwidgetplugin/customwidgetplugin.pro
+++ b/examples/designer/customwidgetplugin/customwidgetplugin.pro
@@ -28,8 +28,3 @@ SOURCES = analogclock.cpp \
customwidgetplugin.cpp
OTHER_FILES += analogclock.json
#! [3]
-
-# install
-sources.files = $$SOURCES $$HEADERS *.pro analogclock.json
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/customwidgetplugin
-INSTALLS += sources
diff --git a/examples/designer/designer.pro b/examples/designer/designer.pro
index f02639443..348b684c9 100644
--- a/examples/designer/designer.pro
+++ b/examples/designer/designer.pro
@@ -11,9 +11,3 @@ SUBDIRS = calculatorform
# the sun cc compiler has a problem with the include lines for the form.prf
solaris-cc*:SUBDIRS -= calculatorbuilder \
worldtimeclockbuilder
-
-
-# install
-sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer
-INSTALLS += sources
diff --git a/examples/designer/taskmenuextension/taskmenuextension.pro b/examples/designer/taskmenuextension/taskmenuextension.pro
index e7ff5c697..685697f93 100644
--- a/examples/designer/taskmenuextension/taskmenuextension.pro
+++ b/examples/designer/taskmenuextension/taskmenuextension.pro
@@ -32,8 +32,3 @@ SOURCES += tictactoe.cpp \
tictactoetaskmenu.cpp
OTHER_FILES += tictactoe.json
#! [2]
-
-# install
-sources.files = $$SOURCES $$HEADERS *.pro tictactoe.json
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/taskmenuextension
-INSTALLS += sources
diff --git a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
index 180d7a340..eb1e3b75e 100644
--- a/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
+++ b/examples/designer/worldtimeclockbuilder/worldtimeclockbuilder.pro
@@ -6,6 +6,4 @@ RESOURCES = worldtimeclockbuilder.qrc
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/worldtimeclockbuilder
-sources.files = $$SOURCES $$HEADERS $$RESOURCES *.ui *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/worldtimeclockbuilder
-INSTALLS += target sources
+INSTALLS += target
diff --git a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
index 8e69ddc5e..1f4301e53 100644
--- a/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
+++ b/examples/designer/worldtimeclockplugin/worldtimeclockplugin.pro
@@ -26,8 +26,3 @@ HEADERS = worldtimeclock.h \
SOURCES = worldtimeclock.cpp \
worldtimeclockplugin.cpp
#! [2]
-
-# install
-sources.files = $$SOURCES $$HEADERS *.pro worldtimeclock.json
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/designer/worldtimeclockplugin
-INSTALLS += sources
diff --git a/examples/help/contextsensitivehelp/contextsensitivehelp.pro b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
index 95df7d963..4f3da5255 100644
--- a/examples/help/contextsensitivehelp/contextsensitivehelp.pro
+++ b/examples/help/contextsensitivehelp/contextsensitivehelp.pro
@@ -12,6 +12,4 @@ FORMS += wateringconfigdialog.ui
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/contextsensitivehelp
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.doc doc
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/contextsensitivehelp
-INSTALLS += target sources
+INSTALLS += target
diff --git a/examples/help/help.pro b/examples/help/help.pro
index e0d19e64b..5a4eb2a35 100644
--- a/examples/help/help.pro
+++ b/examples/help/help.pro
@@ -4,8 +4,3 @@ CONFIG += ordered
SUBDIRS += contextsensitivehelp \
remotecontrol \
simpletextviewer
-
-# install
-sources.files = README *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help
-INSTALLS += sources
diff --git a/examples/help/remotecontrol/remotecontrol.pro b/examples/help/remotecontrol/remotecontrol.pro
index e972857f8..593c87064 100644
--- a/examples/help/remotecontrol/remotecontrol.pro
+++ b/examples/help/remotecontrol/remotecontrol.pro
@@ -9,7 +9,5 @@ RESOURCES += remotecontrol.qrc
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/remotecontrol
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro *.png *.doc doc
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/remotecontrol
-INSTALLS += target sources
+INSTALLS += target
diff --git a/examples/help/simpletextviewer/simpletextviewer.pro b/examples/help/simpletextviewer/simpletextviewer.pro
index 33dc7281e..232b85995 100644
--- a/examples/help/simpletextviewer/simpletextviewer.pro
+++ b/examples/help/simpletextviewer/simpletextviewer.pro
@@ -12,6 +12,4 @@ QT += widgets
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/simpletextviewer
-sources.files = $$SOURCES $$HEADERS $$RESOURCES documentation *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qttools/help/simpletextviewer
-INSTALLS += target sources
+INSTALLS += target
diff --git a/examples/uitools/multipleinheritance/multipleinheritance.pro b/examples/uitools/multipleinheritance/multipleinheritance.pro
index b967c33d5..cabdefdd4 100644
--- a/examples/uitools/multipleinheritance/multipleinheritance.pro
+++ b/examples/uitools/multipleinheritance/multipleinheritance.pro
@@ -6,8 +6,6 @@ FORMS = calculatorform.ui
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools/multipleinheritance
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools/multipleinheritance
-INSTALLS += target sources
+INSTALLS += target
QT += widgets
diff --git a/examples/uitools/textfinder/textfinder.pro b/examples/uitools/textfinder/textfinder.pro
index 48eaa410d..54309621d 100644
--- a/examples/uitools/textfinder/textfinder.pro
+++ b/examples/uitools/textfinder/textfinder.pro
@@ -4,8 +4,6 @@ SOURCES = textfinder.cpp main.cpp
# install
target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools/textfinder
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS *.pro forms
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools/textfinder
-INSTALLS += target sources
+INSTALLS += target
QT += widgets uitools
diff --git a/examples/uitools/uitools.pro b/examples/uitools/uitools.pro
index 04cf4ba17..659e6532e 100644
--- a/examples/uitools/uitools.pro
+++ b/examples/uitools/uitools.pro
@@ -3,10 +3,4 @@ SUBDIRS = multipleinheritance
!wince*:contains(QT_BUILD_PARTS, tools): SUBDIRS += textfinder
-# install
-target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools
-sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS uitools.pro README
-sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/uitools
-INSTALLS += target sources
-
QT += widgets