From dbc60f219e1a193831ac22c5f801692231331888 Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Tue, 26 Apr 2016 14:44:49 +0200 Subject: Add changes-5.6.0. This was requested by Jani, even though only minor improvements have been made to Qt WebChannel. Change-Id: I601d6cc05711556d899b2459cba45f1b48d2aa3a Reviewed-by: Jani Heikkinen --- dist/changes-5.6.0 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 dist/changes-5.6.0 diff --git a/dist/changes-5.6.0 b/dist/changes-5.6.0 new file mode 100644 index 0000000..2c298ca --- /dev/null +++ b/dist/changes-5.6.0 @@ -0,0 +1,21 @@ +Qt 5.6 introduces many new features and improvements as well as bugfixes +over the 5.5.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5.6 + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* General * +**************************************************************************** + - This release contains only minor improvements. -- cgit v1.2.1 From 50df8371ad478bec8cffef8af7344a5c008b9e76 Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Wed, 27 Apr 2016 10:41:49 +0200 Subject: Also add changes file for 5.6.1 release. Change-Id: I509dbfd09d64d8b2a3e9ff17893e99d78a9186f8 Reviewed-by: Jani Heikkinen --- dist/changes-5.6.1 | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 dist/changes-5.6.1 diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1 new file mode 100644 index 0000000..2c298ca --- /dev/null +++ b/dist/changes-5.6.1 @@ -0,0 +1,21 @@ +Qt 5.6 introduces many new features and improvements as well as bugfixes +over the 5.5.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5.6 + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* General * +**************************************************************************** + - This release contains only minor improvements. -- cgit v1.2.1 From 79a0e79b248c1cac4f8a69efc228e28e4ac4725d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 20 Apr 2016 20:54:21 +0200 Subject: fix example installs Change-Id: Iccf9f6e0e9358ba42576fb67a0b356c7414d911e Reviewed-by: Milian Wolff --- examples/webchannel/chatclient-html/chatclient-html.pro | 2 +- examples/webchannel/chatclient-qml/chatclient-qml.pro | 2 +- examples/webchannel/chatserver-cpp/chatserver-cpp.pro | 3 +++ examples/webchannel/nodejs/nodejs.pro | 2 +- examples/webchannel/qwclient/qwclient.pro | 2 +- examples/webchannel/standalone/standalone.pro | 5 ++++- examples/webchannel/webchannel.pro | 3 +++ 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 -- cgit v1.2.1 From bd0f933457227c615c5f11aacd471e58b88678e8 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 22 Apr 2016 20:59:40 +0200 Subject: make use of COPIES Change-Id: Ic3979ec70b7ddf7d01d0873c00b7739c5f0ef3c9 Reviewed-by: Milian Wolff --- examples/webchannel/exampleassets.pri | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/examples/webchannel/exampleassets.pri b/examples/webchannel/exampleassets.pri index 035ca12..bbdf656 100644 --- a/examples/webchannel/exampleassets.pri +++ b/examples/webchannel/exampleassets.pri @@ -2,7 +2,7 @@ QTDIR_build { # Build from within Qt. Copy and install the reference lib. jslib = $$dirname(_QMAKE_CONF_)/src/webchannel/qwebchannel.js - copyfiles = $$jslib + assetcopy.files = $$jslib } else { # This is what an actual 3rd party project would do. jslib = qwebchannel.js @@ -16,16 +16,8 @@ INSTALLS += exampleassets !equals(_PRO_FILE_PWD_, $$OUT_PWD) { # Shadow build, copy all example assets. - copyfiles = $$exampleassets.files + assetcopy.files = $$exampleassets.files } -defineReplace(stripSrcDir) { - return($$basename(1)) -} - -assetcopy.input = copyfiles -assetcopy.output = $$OUT_PWD/${QMAKE_FUNC_FILE_IN_stripSrcDir} -assetcopy.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT} -assetcopy.name = COPY ${QMAKE_FILE_IN} -assetcopy.CONFIG = no_link target_predeps -QMAKE_EXTRA_COMPILERS += assetcopy +assetcopy.path = $$OUT_PWD +COPIES += assetcopy -- cgit v1.2.1 From b06c69533baeb2f80897f72ed787b51e122ffafc Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Tue, 10 May 2016 14:54:31 +0200 Subject: Doc: Remove repository name from examplesinstallpath Examples in binary packages now directly match the install path. Change-Id: I06c85e42d312bd6a1e1ae619330676b717b6ccbd Reviewed-by: Milian Wolff --- src/webchannel/doc/qtwebchannel.qdocconf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/webchannel/doc/qtwebchannel.qdocconf b/src/webchannel/doc/qtwebchannel.qdocconf index fc036d2..cfb47e4 100644 --- a/src/webchannel/doc/qtwebchannel.qdocconf +++ b/src/webchannel/doc/qtwebchannel.qdocconf @@ -4,7 +4,7 @@ project = QtWebChannel description = Qt WebChannel Reference Documentation version = $QT_VERSION -examplesinstallpath = qtwebchannel/webchannel +examplesinstallpath = webchannel qhp.projects = QtWebChannel -- cgit v1.2.1 From 39692e398ef847a1d6482419a617452cb1e5ae0d Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 19 May 2016 13:27:29 +0200 Subject: Bump version Change-Id: I73f3738a4ba90af8bc8572edecda56bec7d1f60b --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index eb2e19a..b7605bf 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -1,4 +1,4 @@ load(qt_build_config) CONFIG += qt_example_installs warning_clean -MODULE_VERSION = 5.6.1 +MODULE_VERSION = 5.6.2 -- cgit v1.2.1