summaryrefslogtreecommitdiffstats
path: root/examples/sql
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2012-11-27 20:40:16 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-11-29 20:21:11 +0100
commitaeb036ed8715d0c099d3dca87f7def4dbaf8e9b4 (patch)
tree95a679c8b456c61bc108e1a68b0aced288313df6 /examples/sql
parent12dcab77a7248268c58c2c5431c2c237e14d1089 (diff)
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 <qthjk@ovi.com>
Diffstat (limited to 'examples/sql')
-rw-r--r--examples/sql/books/books.pro4
-rw-r--r--examples/sql/cachedtable/cachedtable.pro4
-rw-r--r--examples/sql/drilldown/drilldown.pro4
-rw-r--r--examples/sql/masterdetail/masterdetail.pro6
-rw-r--r--examples/sql/querymodel/querymodel.pro4
-rw-r--r--examples/sql/relationaltablemodel/relationaltablemodel.pro4
-rw-r--r--examples/sql/sql.pro6
-rw-r--r--examples/sql/sqlbrowser/sqlbrowser.pro4
-rw-r--r--examples/sql/sqlwidgetmapper/sqlwidgetmapper.pro4
-rw-r--r--examples/sql/tablemodel/tablemodel.pro4
10 files changed, 13 insertions, 31 deletions
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