summaryrefslogtreecommitdiffstats
path: root/examples/network
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/network
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/network')
-rw-r--r--examples/network/bearermonitor/bearermonitor.pro6
-rw-r--r--examples/network/blockingfortuneclient/blockingfortuneclient.pro4
-rw-r--r--examples/network/broadcastreceiver/broadcastreceiver.pro4
-rw-r--r--examples/network/broadcastsender/broadcastsender.pro4
-rw-r--r--examples/network/dnslookup/dnslookup.pro4
-rw-r--r--examples/network/download/download.pro4
-rw-r--r--examples/network/downloadmanager/downloadmanager.pro4
-rw-r--r--examples/network/fortuneclient/fortuneclient.pro4
-rw-r--r--examples/network/fortuneserver/fortuneserver.pro4
-rw-r--r--examples/network/googlesuggest/googlesuggest.pro4
-rw-r--r--examples/network/http/http.pro4
-rw-r--r--examples/network/loopback/loopback.pro4
-rw-r--r--examples/network/multicastreceiver/multicastreceiver.pro4
-rw-r--r--examples/network/multicastsender/multicastsender.pro4
-rw-r--r--examples/network/network-chat/network-chat.pro4
-rw-r--r--examples/network/network.pro6
-rw-r--r--examples/network/securesocketclient/securesocketclient.pro4
-rw-r--r--examples/network/threadedfortuneserver/threadedfortuneserver.pro4
-rw-r--r--examples/network/torrent/torrent.pro5
19 files changed, 20 insertions, 61 deletions
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)