diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:45:42 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:45:42 +0200 |
| commit | cd80c041220df2875297622a0012933412730e9d (patch) | |
| tree | 2f691d075c2cc708f1b2121306df1f5a019ce33b /examples/websockets/qmlwebsocketserver | |
| parent | 00156d63eea2fb7681a8a00a3144392d6325e5cb (diff) | |
| parent | 9d28979b204313b4db1ce8e9f367204a65be9c64 (diff) | |
| download | qtwebsockets-cd80c041220df2875297622a0012933412730e9d.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
.qmake.conf
Change-Id: I80cd189fc82481fdc2241db6d2a7d95537c340a6
Diffstat (limited to 'examples/websockets/qmlwebsocketserver')
| -rw-r--r-- | examples/websockets/qmlwebsocketserver/qmlwebsocketserver.pro | 3 |
1 files changed, 3 insertions, 0 deletions
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 |