summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-04-20 20:54:21 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-04-28 18:56:44 +0000
commit79a0e79b248c1cac4f8a69efc228e28e4ac4725d (patch)
treed622741dcc8a8a22dfbba1ec9f399a447f3cf6b8
parent50df8371ad478bec8cffef8af7344a5c008b9e76 (diff)
downloadqtwebchannel-79a0e79b248c1cac4f8a69efc228e28e4ac4725d.tar.gz
fix example installs
Change-Id: Iccf9f6e0e9358ba42576fb67a0b356c7414d911e Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
-rw-r--r--examples/webchannel/chatclient-html/chatclient-html.pro2
-rw-r--r--examples/webchannel/chatclient-qml/chatclient-qml.pro2
-rw-r--r--examples/webchannel/chatserver-cpp/chatserver-cpp.pro3
-rw-r--r--examples/webchannel/nodejs/nodejs.pro2
-rw-r--r--examples/webchannel/qwclient/qwclient.pro2
-rw-r--r--examples/webchannel/standalone/standalone.pro5
-rw-r--r--examples/webchannel/webchannel.pro3
7 files changed, 14 insertions, 5 deletions
diff --git a/examples/webchannel/chatclient-html/chatclient-html.pro b/examples/webchannel/chatclient-html/chatclient-html.pro
index f5f0bf4..6aa0b0a 100644
--- a/examples/webchannel/chatclient-html/chatclient-html.pro
+++ b/examples/webchannel/chatclient-html/chatclient-html.pro
@@ -3,5 +3,5 @@ TEMPLATE = aux
exampleassets.files += \
chatclient.html
-exampleassets.path = $$[QT_INSTALL_EXAMPLES]/qwebchannel/chatclient-html
+exampleassets.path = $$[QT_INSTALL_EXAMPLES]/webchannel/chatclient-html
include(../exampleassets.pri)
diff --git a/examples/webchannel/chatclient-qml/chatclient-qml.pro b/examples/webchannel/chatclient-qml/chatclient-qml.pro
index 74b274d..185ffde 100644
--- a/examples/webchannel/chatclient-qml/chatclient-qml.pro
+++ b/examples/webchannel/chatclient-qml/chatclient-qml.pro
@@ -3,5 +3,5 @@ TEMPLATE = aux
exampleassets.files += \
qmlchatclient.qml
-exampleassets.path = $$[QT_INSTALL_EXAMPLES]/qwebchannel/chatclient-qml
+exampleassets.path = $$[QT_INSTALL_EXAMPLES]/webchannel/chatclient-qml
include(../exampleassets.pri)
diff --git a/examples/webchannel/chatserver-cpp/chatserver-cpp.pro b/examples/webchannel/chatserver-cpp/chatserver-cpp.pro
index ce6a3f7..a7ee42f 100644
--- a/examples/webchannel/chatserver-cpp/chatserver-cpp.pro
+++ b/examples/webchannel/chatserver-cpp/chatserver-cpp.pro
@@ -16,3 +16,6 @@ HEADERS += \
chatserver.h \
../shared/websocketclientwrapper.h \
../shared/websockettransport.h
+
+target.path = $$[QT_INSTALL_EXAMPLES]/webchannel/chatserver-cpp
+INSTALLS += target
diff --git a/examples/webchannel/nodejs/nodejs.pro b/examples/webchannel/nodejs/nodejs.pro
index 4df94d2..4da5fc7 100644
--- a/examples/webchannel/nodejs/nodejs.pro
+++ b/examples/webchannel/nodejs/nodejs.pro
@@ -3,5 +3,5 @@ TEMPLATE = aux
exampleassets.files += \
chatclient.js \
package.json
-exampleassets.path = $$[QT_INSTALL_EXAMPLES]/qwebchannel/nodejs
+exampleassets.path = $$[QT_INSTALL_EXAMPLES]/webchannel/nodejs
include(../exampleassets.pri)
diff --git a/examples/webchannel/qwclient/qwclient.pro b/examples/webchannel/qwclient/qwclient.pro
index 587571a..374a63b 100644
--- a/examples/webchannel/qwclient/qwclient.pro
+++ b/examples/webchannel/qwclient/qwclient.pro
@@ -5,5 +5,5 @@ exampleassets.files += \
package.json \
README
-exampleassets.path = $$[QT_INSTALL_EXAMPLES]/qwebchannel/qwclient
+exampleassets.path = $$[QT_INSTALL_EXAMPLES]/webchannel/qwclient
include(../exampleassets.pri)
diff --git a/examples/webchannel/standalone/standalone.pro b/examples/webchannel/standalone/standalone.pro
index 19aa264..cfe4297 100644
--- a/examples/webchannel/standalone/standalone.pro
+++ b/examples/webchannel/standalone/standalone.pro
@@ -18,5 +18,8 @@ DEFINES += "BUILD_DIR=\"\\\""$$OUT_PWD"\\\"\""
exampleassets.files += \
index.html
-exampleassets.path = $$[QT_INSTALL_EXAMPLES]/qwebchannel/standalone
+exampleassets.path = $$[QT_INSTALL_EXAMPLES]/webchannel/standalone
include(../exampleassets.pri)
+
+target.path = $$[QT_INSTALL_EXAMPLES]/webchannel/standalone
+INSTALLS += target
diff --git a/examples/webchannel/webchannel.pro b/examples/webchannel/webchannel.pro
index 7d3db8d..fd3a072 100644
--- a/examples/webchannel/webchannel.pro
+++ b/examples/webchannel/webchannel.pro
@@ -10,3 +10,6 @@ qtHaveModule(websockets) {
SUBDIRS += nodejs \
qwclient \
chatclient-html
+
+EXAMPLE_FILES += \
+ shared