diff options
-rw-r--r-- | dist/changes-5.6.0 | 21 | ||||
-rw-r--r-- | dist/changes-5.6.1 | 21 | ||||
-rw-r--r-- | examples/webchannel/chatclient-html/chatclient-html.pro | 2 | ||||
-rw-r--r-- | examples/webchannel/chatclient-qml/chatclient-qml.pro | 2 | ||||
-rw-r--r-- | examples/webchannel/chatserver-cpp/chatserver-cpp.pro | 3 | ||||
-rw-r--r-- | examples/webchannel/exampleassets.pri | 16 | ||||
-rw-r--r-- | examples/webchannel/nodejs/nodejs.pro | 2 | ||||
-rw-r--r-- | examples/webchannel/qwclient/qwclient.pro | 2 | ||||
-rw-r--r-- | examples/webchannel/standalone/standalone.pro | 5 | ||||
-rw-r--r-- | examples/webchannel/webchannel.pro | 3 | ||||
-rw-r--r-- | src/webchannel/doc/qtwebchannel.qdocconf | 2 |
11 files changed, 61 insertions, 18 deletions
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. 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. 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/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 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 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 |