| Commit message (Collapse) | Author | Age | Files | Lines |
|
|
|
| |
Change-Id: I5508bb77d24a5c1dcacf4d0dee57c31195c0a188
|
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Alleged Conflicts:
examples/webchannel/chatclient-html/doc/src/chatclient-html.qdoc
examples/webchannel/chatclient-qml/doc/src/chatclient-qml.qdoc
examples/webchannel/chatserver-cpp/doc/src/chatserver-cpp.qdoc
In each case, the two sides agreed byte-for-byte.
Not quite sure what git thought the conflict was !
Change-Id: I5da9695b667f4112848c520b630ab1304d61cea3
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This test passes and seems to indicate that the signal-delivery has
an issue, or that the issue lies on the JavaScript side.
Change-Id: Ic2436147b3af49d35dc556da57aed3e54408f1f9
Task-number: QTBUG-54074
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
This enables you to pass `QObject*` parameters via signals to the
JavaScript side. The object will be serialized and then unwrapped
as needed now.
Task-number: QTBUG-54243
Change-Id: Ie8a6d14eb1351f14f1855d242ceb3b3f8262152d
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
If you get an object from the server and want to pass it back to the
server via a function the id of the object is passed instead of the
whole json object. On the server side QMetaObjectPublisher::invokeMethod
now looks up the object in QMetaObjectPublisher::wrappedObjects by the
passed object-id.
Task-number: QTBUG-50075
Change-Id: Id0df2dfaa79bcba12ca48391ae7537ac1a086898
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771
Change-Id: I84346b304041f23abe6f1b99d8681199b03e57f4
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
You don't need the type name for linking within the type docs.
Also, the convention in QML and Qt Quick is to use a period and
not a double colon.
Change-Id: Ic93bae51e766ef782f089ce69dc4e54a712445c6
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| | |
And fix a typo "connectect".
Change-Id: I14c4b249af3cad142a5f6042b2059f653a9c3eae
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
For consistency, the first verb should be in 3rd person
singular form.
Change-Id: I5e24ecbbac1b1ab85e737f127b021f24a55c8dd4
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| |
| |
| | |
-Remove references to Qt WebKit
Change-Id: I0bd184021b1a87828e93f5783c38b9ba97f37763
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Remove reference to Qt WebKit
- Add Getting Started section
- Use standard section titles for API Reference
and Examples
Change-Id: Ie5e3ac792a109f680132a79e86d5e1065f4c3829
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Add images to the examples.
- Add instructions for running the examples
- Edit for grammar and style
- Add dependencies to Qt WebEngine and Qt WebSockets modules
- Add a workaround for preventing autolinking of WebChannel,
WebEngine and WebSockets to the wrong targets
- Use explicit linking where necessary
Change-Id: Ia4025284063fa09c9e2a0b2c347ee682bba8a615
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Similar to the previous issue, where these types were not properly
converted to QVariant when invoking a method, we manually do the
conversion now to get the desired behavior. The culprit is again
that QJsonValue::toVariant converts an object e.g. to a QVariantMap,
and not to a QVariant containing a QJsonObject.
[ChangeLog] QObject properties of type QJsonValue, QJsonArray or
QJsonObject can now be set via the Qt WebChannel.
Task-number: QTBUG-48198
Change-Id: I5d574b1a5cffd6d6ad9b555f2a3e872b9c3425a7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
We used to convert the QJsonValue arguments to QVariants, which
then failed to call a C++ function which expected on of the three
QJson data types, i.e. QJsonValue, QJsonObject or QJsonArray. Instead,
we now detect these three cases and manually convert the QJsonValue
as needed.
[ChangeLog] C++ functions taking arguments of type QJsonValue,
QJsonArray or QJsonObject can now be called via the Qt WebChannel.
Change-Id: I94e0c8937ca35e2ecd3554f7ddf2d4e5a3328570
Task-number: QTBUG-48198
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| |
| |
| |
| |
| |
| |
| | |
it's done centrally now.
Change-Id: I0922b2083b594cdf61f4606fe17c9c61c0d4683a
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
|\ \
| | |
| | |
| | | |
Change-Id: If663d043ad0da98731e436309d3b40e3379b0831
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Change-Id: I9120c4d9c6cf08cdaaec468a514e2ab060abde35
Task-number: QTBUG-53913
Reviewed-by: Sami Makkonen <sami.makkonen@qt.io>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Add images to the examples.
- Add instructions for running the examples
- Edit for grammar and style
- Add dependencies to Qt WebEngine and Qt WebSockets modules
- Add a workaround for preventing autolinking of WebChannel,
WebEngine and WebSockets to the wrong targets
- Use explicit linking where necessary
Change-Id: Ia4025284063fa09c9e2a0b2c347ee682bba8a615
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
(cherry picked from commit 01ea92c7c8d77d3d3c10ab1cc4bf4f214aa07126)
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I52dc7e8ad7a9ce6fa36ad2d6ce5d8ea29b77b400
|
| |
| |
| |
| | |
Change-Id: I73f3738a4ba90af8bc8572edecda56bec7d1f60b
|
| |
| |
| |
| |
| |
| |
| | |
Examples in binary packages now directly match the install path.
Change-Id: I06c85e42d312bd6a1e1ae619330676b717b6ccbd
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: Ic3979ec70b7ddf7d01d0873c00b7739c5f0ef3c9
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: Iccf9f6e0e9358ba42576fb67a0b356c7414d911e
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: I509dbfd09d64d8b2a3e9ff17893e99d78a9186f8
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This was requested by Jani, even though only minor improvements have
been made to Qt WebChannel.
Change-Id: I601d6cc05711556d899b2459cba45f1b48d2aa3a
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
This was requested by Jani, even though only minor improvements have
been made to Qt WebChannel.
Change-Id: Idf8f98bfa1450bfbc5e5442a11b11c2381894d0e
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
|
|\ \
| |/
| |
| | |
Change-Id: Ifb2b9cc762b5c75f1ec3bf47c607906fdfef9bd1
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
... or equivalent.
QtBase 5.6 headers already compile that way, so let the other
modules follow suit.
Change-Id: I972f844bd5845f4d7d88a14ff1b358c8c2b2643d
Task-number: QTBUG-45291
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| | |
this fixes static builds by ensuring that all dependencies are exported.
Task-number: QTBUG-51071
Change-Id: Ibf63974f6b989abb6c7967a74ff770af09bab114
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: I42bfb38e5a9bf03b43636309fe9e29e8d772bb06
|
| |\
| | |
| | |
| | | |
Change-Id: Iafa14f898762ae1134a6c9b97afaad44af621cbe
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I34bcf2e4a2d66c9cb126c2edae79a45064b82a67
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |/
| |
| |
| | |
Change-Id: I7c7c1a8702698b9b37752eaa7cb5d676857b9be8
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The JS file lives in the src/webchannel directory, and there
is a QMake magic in place to copy it to the build directory. But
this mechanism fails when the example is run from the Qt binary
pkg, which does not include the sources. The JS file must be copied
to the build directory either manually or programmatically to run
the example.
Change-Id: Ib56d9348a8bf1a599e2db5235e0545cd7a8f3bb1
Task-number: QTBUG-46541
Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The baseUrl that is used to connect to a WebSocket server is derived
from the query parameters set to the URL. These parameters are ignored
by the QDesktopServices::openUrl implementations specific to Windows
and OS X. Ubuntu uses the default implementation that retains
the query parameters. This means the browser instance will fail to open
the local file URL on Ubuntu because it includes the query parameters,
so query parameters should never be set.
Moreover, the example creates a QWebSocketServer instance, which is
available at ws://localhost:12345, so the it is safe to hardcode the
address in the JavaScript. The cleaner approach would be to use a
URLHandler as described in
http://doc.qt.io/qt-5/qdesktopservices.html#url-handlers, but that
complicates the example.
Change-Id: I5b5df2b7b816ce0bbfb16a85c036ed379616f04a
Task-number: QTBUG-46541
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
The examplesinstallpath variable in .qdocconf files defines the path
under QT_INSTALL_EXAMPLES where examples are found.
To match the way examples are packaged in Qt 5.6, prefix the
install path with the repository name.
Task-number: QTBUG-48736
Change-Id: Iafb0663b319f97d2fa3e8f938e4546ae11eaaa69
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |
| |
| |
| |
| | |
Change-Id: I79bf51daf8451fab4fc0dc6af64d119383fa7387
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
From Qt 5.7 -> tools & applications are lisenced under GPL v3 with some
exceptions, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new GPL-EXCEPT header instead of LGPL21 one
(in those files which will be under GPL 3 with exceptions)
Change-Id: I1c2917ddcb2436477aefde3dc640155d5131a664
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
From Qt 5.7 -> examples are lisenced under BSD license, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new BSD header instead of LGPL21 one
(in those files which will be under BSD)
Change-Id: I67629f4d4480e9ba566d7539d62c7cd4e89342e3
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
From Qt 5.7 -> LGPL v2.1 isn't an option anymore, see
http://blog.qt.io/blog/2016/01/13/new-agreement-with-the-kde-free-qt-foundation/
Updated license headers to use new LGPL header instead of LGPL21 one
(in those files which will be under LGPL v3)
Change-Id: I2fe282e6b9d52f9635cd69e3e8de53724cbb8b0a
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
|\ \
| |/
| |
| | |
Change-Id: I0b933efe65501476b0004afd6f7c36672baa897c
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/webchannel/qmetaobjectpublisher.cpp
src/webchannel/webchannel.pro
Change-Id: Ia573d780424399a8fa6e5a809148c888b223446a
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since QJSValue is part of the QML module then it should check if that is
available before using it so we add a QT_NO_JSVALUE define to help with
this.
Task-number: QTBUG-46850
Change-Id: I1974518a5c134dbb8508a46505b43c820a7a700a
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
|
| |\ \
| | |/
| | |
| | | |
Change-Id: Idcdb6378bb72a87af378d747e01401e5ea4e6f7f
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
LGPLv3 refers to it but does not include it in its body.
Change-Id: Ib056b47dde3341ef9a52ffff13eed18cf3504738
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This will cause the transport to be removed from the "transports" member
of the QQmlWebChannel. Otherwise it would linger around eating resources.
Thanks to Jannis Voelker for pointing it out.
Change-Id: I5aca499dfd0bdefc075fa5717436ab0919ec6ab1
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Uniformly use the <Module/class.h> style, like
https://wiki.qt.io/Coding_Conventions
mandates.
Change-Id: Ia2de5fb5ba4e3229c614c204d43349bd7fcbeaab
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The transport owns the socket and should therefore delete it.
Kudos to Jannis Voelker for pointing it out.
Change-Id: Ie6df93c92e00ac64bc4c329b68cbc9c6598257ab
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
|/ /
| |
| |
| | |
Change-Id: I631db196a1969efc3f45678f00819ac8105e9c82
|
| |
| |
| |
| |
| |
| |
| |
| | |
When we build without qml module we cannot use QJSValue in
qmetaobjectpublisher
Change-Id: I79d06d8cc6d43fdad57cbab17ebc1756444a7311
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|