From 9aec42da31463daf38a2c2813b585e9240acac41 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 20:49:47 +0200 Subject: add example installs Change-Id: I49d9fda43374776685d2ab1fa653287447d34028 Reviewed-by: Joerg Bornemann --- examples/websockets/echoclient/echoclient.pro | 3 +++ examples/websockets/echoserver/echoserver.pro | 5 ++++- examples/websockets/qmlwebsocketclient/qmlwebsocketclient.pro | 3 +++ examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro | 3 +++ examples/websockets/simplechat/simplechat.pro | 5 ++++- examples/websockets/sslechoclient/sslechoclient.pro | 3 +++ examples/websockets/sslechoserver/sslechoserver.pro | 5 ++++- 7 files changed, 24 insertions(+), 3 deletions(-) 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 -- cgit v1.2.1 From edc358b213b192e8cdc925a4ae1f176c287d6eea Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 21:23:10 +0200 Subject: do not enable example installs explicitly any more it's done centrally now. Change-Id: I0378a3e7b0b881909009719e05e390633eec6466 Reviewed-by: Joerg Bornemann --- .qmake.conf | 1 - 1 file changed, 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index 594a97e..e46c0c8 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.6.1 -- cgit v1.2.1 From 0637eb3f40440f90eb531561e26f3854463bdbb3 Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 10 May 2016 14:54:32 +0200 Subject: Doc: Remove repository name from examplesinstallpath Examples in binary packages now directly match the install path. Change-Id: Id4e9b2bc738ae3b1b35114c74530aa50e4103aa3 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko --- src/websockets/doc/qtwebsockets.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.1 From 9d28979b204313b4db1ce8e9f367204a65be9c64 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 May 2016 13:27:33 +0200 Subject: Bump version Change-Id: Ibaed49134295c769c9c24f455edadce0434964aa --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index e46c0c8..21398dd 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) CONFIG += warning_clean -MODULE_VERSION = 5.6.1 +MODULE_VERSION = 5.6.2 -- cgit v1.2.1