diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:50 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 20:02:50 +0200 |
commit | d387dd2066e79e4a39966331986c3775a0940e96 (patch) | |
tree | 829e5ee9b415bdc852bafe01955869b96397e45d | |
parent | 2baa571e0d95d3e9bf182dc035c8ff0970bb68ea (diff) | |
parent | cd80c041220df2875297622a0012933412730e9d (diff) | |
download | qtwebsockets-d387dd2066e79e4a39966331986c3775a0940e96.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Ic4a2b48535dd9b22a950b84de4bfa2728a859902
-rw-r--r-- | .qmake.conf | 1 | ||||
-rw-r--r-- | examples/websockets/echoclient/echoclient.pro | 3 | ||||
-rw-r--r-- | examples/websockets/echoserver/echoserver.pro | 5 | ||||
-rw-r--r-- | examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro | 3 | ||||
-rw-r--r-- | examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro | 3 | ||||
-rw-r--r-- | examples/websockets/simplechat/simplechat.pro | 5 | ||||
-rw-r--r-- | examples/websockets/sslechoclient/sslechoclient.pro | 3 | ||||
-rw-r--r-- | examples/websockets/sslechoserver/sslechoserver.pro | 5 | ||||
-rw-r--r-- | src/websockets/doc/qtwebsockets.qdocconf | 2 |
9 files changed, 25 insertions, 5 deletions
diff --git a/.qmake.conf b/.qmake.conf index 6769df6..69f27df 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,6 +1,5 @@ load(qt_build_config) -CONFIG += qt_example_installs CONFIG += warning_clean MODULE_VERSION = 5.8.0 diff --git a/examples/websockets/echoclient/echoclient.pro b/examples/websockets/echoclient/echoclient.pro index 24848e7..7c993e6 100644 --- a/examples/websockets/echoclient/echoclient.pro +++ b/examples/websockets/echoclient/echoclient.pro @@ -13,3 +13,6 @@ SOURCES += \ HEADERS += \ echoclient.h + +target.path = $$[QT_INSTALL_EXAMPLES]/websockets/echoclient +INSTALLS += target diff --git a/examples/websockets/echoserver/echoserver.pro b/examples/websockets/echoserver/echoserver.pro index 6d2360b..eacaedc 100644 --- a/examples/websockets/echoserver/echoserver.pro +++ b/examples/websockets/echoserver/echoserver.pro @@ -14,4 +14,7 @@ SOURCES += \ HEADERS += \ echoserver.h -OTHER_FILES += echoclient.html +EXAMPLE_FILES += echoclient.html + +target.path = $$[QT_INSTALL_EXAMPLES]/websockets/echoserver +INSTALLS += target diff --git a/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro b/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro index e7dc82a..37d7823 100644 --- a/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro +++ b/examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro @@ -11,3 +11,6 @@ SOURCES += main.cpp RESOURCES += data.qrc OTHER_FILES += qml/qmlwebsocketclient/main.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/websockets/qmlwebsocketclient +INSTALLS += target diff --git a/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro b/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro index a499c7e..4f1a64f 100644 --- a/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro +++ b/examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro @@ -11,3 +11,6 @@ SOURCES += main.cpp RESOURCES += data.qrc OTHER_FILES += qml/qmlwebsocketserver/main.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/websockets/qmlwebsocketserver +INSTALLS += target diff --git a/examples/websockets/simplechat/simplechat.pro b/examples/websockets/simplechat/simplechat.pro index 5cb6d4f..df6f248 100644 --- a/examples/websockets/simplechat/simplechat.pro +++ b/examples/websockets/simplechat/simplechat.pro @@ -14,4 +14,7 @@ SOURCES += \ HEADERS += \ chatserver.h -OTHER_FILES += *.html +EXAMPLE_FILES += chatclient.html + +target.path = $$[QT_INSTALL_EXAMPLES]/websockets/simplechat +INSTALLS += target diff --git a/examples/websockets/sslechoclient/sslechoclient.pro b/examples/websockets/sslechoclient/sslechoclient.pro index 431301f..925fece 100644 --- a/examples/websockets/sslechoclient/sslechoclient.pro +++ b/examples/websockets/sslechoclient/sslechoclient.pro @@ -13,3 +13,6 @@ SOURCES += \ HEADERS += \ sslechoclient.h + +target.path = $$[QT_INSTALL_EXAMPLES]/websockets/sslechoclient +INSTALLS += target diff --git a/examples/websockets/sslechoserver/sslechoserver.pro b/examples/websockets/sslechoserver/sslechoserver.pro index a1a5275..b1c0528 100644 --- a/examples/websockets/sslechoserver/sslechoserver.pro +++ b/examples/websockets/sslechoserver/sslechoserver.pro @@ -14,6 +14,9 @@ SOURCES += \ HEADERS += \ sslechoserver.h -OTHER_FILES += sslechoclient.html +EXAMPLE_FILES += sslechoclient.html RESOURCES += securesocketclient.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/websockets/sslechoserver +INSTALLS += target diff --git a/src/websockets/doc/qtwebsockets.qdocconf b/src/websockets/doc/qtwebsockets.qdocconf index 4504d30..ba77c82 100644 --- a/src/websockets/doc/qtwebsockets.qdocconf +++ b/src/websockets/doc/qtwebsockets.qdocconf @@ -4,7 +4,7 @@ project = QtWebSockets description = Qt WebSockets Reference Documentation version = $QT_VERSION -examplesinstallpath = qtwebsockets/websockets +examplesinstallpath = websockets qhp.projects = QtWebSockets |