| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ibf86cdf744d1081f40f734e4a30ca24581e1cc2d
|
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Patch e354bdc5 introduced a regression that triggers a crash
in Qt 5.9 when returning a type that is not implicitly convertible
to QVariant, such as a QJsonValue, from an invoked method/slot.
This patch fixes this situation and adds proper unit test coverage.
Change-Id: Ib8cb0c96e7496bc8dc9a628245d7a44e4234aff0
Task-number: QTBUG-62045
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Reviewed-by: Kai Dohmen <psykai1993@googlemail.com>
|
| |\
| | |
| | |
| | | |
Change-Id: I93431a20912046a951d2e8f25471b3533a459241
|
| | |
| | |
| | |
| | |
| | | |
Change-Id: I52fe90748f5f07a51b477eae4d72a9941646814b
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
|
| | |
| | |
| | |
| | | |
Change-Id: If2f94cf279858115eab6033859d29d2636965c03
|
| |/
| |
| |
| |
| |
| |
| | |
Binary compatibility file for Qt 5.9.0 updated.
Change-Id: Ie1486ba7e4777fe88b03697f10ee6069f71ea575
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
|\ \
| |/
| |
| |
| |
| |
| | |
Conflicts:
.qmake.conf
Change-Id: Ibd56abaa0b9d9aac275be41209ba2db3fc79e212
|
| |\
| | |
| | |
| | | |
Change-Id: I65d79f799498f2a20fcf9161f529139483c50518
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Listing important changes and bug-fixes.
Change-Id: Id76e380ae874fe997b46747ef2c5b3fa405944fe
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
When an object is deregistered before the signal handler got
initializated, we asserted. Now, we check for this case and skip the
signal handler removal when it wasn't set up yet.
Change-Id: I7abad204cbab72be7729d42f58ce63babd2310d8
Task-number: QTBUG-60250
Reviewed-by: Kai Dohmen <psykai1993@googlemail.com>
Reviewed-by: Konstantin Tokarev <annulen@yandex.ru>
|
| | |
| | |
| | |
| | | |
Change-Id: I23bc6a2f8734b34ab5193a3ebcbebde3c98b2611
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
- Replace old LGPL21 license headers with GPL-EXCEPT one (which is
currently used in tools and tests)
- Remove old, unnecessary license files
Task-number: QTBUG-57147
Change-Id: I33e9a2e6771874dbbc7281f96f09a4fc03d57b54
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| |\
| | |
| | |
| | | |
Change-Id: Ica9ad5eb461d38cd5c40d7f7f22a81b55e427d87
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added binary compatibility file for qtwebchannel
Change-Id: I4a5f32fe50ac08885b8eb574d3abe9b931c13040
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: I61aae1bc9363fa234bafc730e1f60eb3b05114cc
|
| | | |
| | | |
| | | |
| | | |
| | | | |
Change-Id: Ide462548e58ebd60b4049858754f9d1b56fd44a8
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
|/ / /
| | |
| | |
| | | |
Change-Id: Ia17a12a4514aeaf76e6c97a9296cd1a8f7ad4f96
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
Change-Id: I601a28bfd7eb92d894295d7b7848b4a80dcc1d5d
|
| |/
| |
| |
| | |
Change-Id: Ic324e77322de09c4b6b47a1300d024c88bb6f6ae
|
| |\
| | |
| | |
| | | |
Change-Id: I09a494a9b94ce169d60e77f4bffa8845db01293a
|
| | |\
| | | |
| | | |
| | | | |
Change-Id: I773dacf2a5513327db8be0837e7514685cbd1dc4
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
the CI obtains them from the qt5 super repo nowadays.
Change-Id: If99fe829b8c17802d1b9a7a4a12d9dfe98c54e73
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Means to run the binary compatibility (BC) test for QtWebChannel added
Change-Id: I6684b34d10c44340aa852bf9eae81b35e1ae4d2b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
|
| | |\ \
| | | | |
| | | | |
| | | | | |
Change-Id: I5a2028d705c3ba57c9bd770286ae6aa3d24a9513
|
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Change-Id: Id51e16ae5bc9592eacad75642e408e1743416af8
Reviewed-by: Kai Koehne <kai.koehne@qt.io>
|
| | |/ /
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Binary compatibility (BC) file for QtWebChannel added
Change-Id: I4de49243be8d77eb0295b653dba2dd75379361fa
Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
|
| | |\ \
| | | |/
| | | |
| | | | |
Change-Id: Ib8b5300d27583018bc7582be41140dfda0ab5309
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Switches the signal listener in QWebChannel from using
Qt::DirectConnection to Qt::AutoConnection to relay signals
from QObjects in different affinities than the QWebChannel.
Also adds a unit test in testAsyncObject() to verify that
QWebChannel no longer crashes when receiving such a signal,
and that such objects can be added and removed dynamically.
Task-number: QTBUG-51366
Change-Id: I51a4886286fec9257a21ea95360c1ea8889a584a
Reviewed-by: Dave Andrews <jetdog330@hotmail.com>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
Use QMetaMethod::invoke without a return for void method calls,
which allows making asynchronous method calls onto QObjects in
different affinities than the QWebChannel that's emitting them.
Also adds a unit test called testAsyncObject that intentionally
places a QObject in a different affinity and then tests calls
into it from the QWebChannel's synchronous publisher.
Task-number: QTBUG-47678
Change-Id: I6c35ee54f764c0fc1b0431fb0774aa7e75039abf
Reviewed-by: Dave Andrews <jetdog330@hotmail.com>
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
|/ / /
| | |
| | |
| | | |
Change-Id: I9c9d3330bf75912b55a99f2bb88822b1cefb0f5e
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Since commit 709f6370884b110def2e4665df8fa7bbf5fae734 the plugin loader
is strict about requiring the correct interface id, to avoid loading
unrelated plugins in the loader thread (which they may not be prepared
to do).
Change-Id: If86aec735525d2fd169d2d3fae451316f656f238
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
.qmake.conf
tests/auto/webchannel/tst_webchannel.cpp
tests/auto/webchannel/tst_webchannel.h
Change-Id: I01b0f58c10acbef8e2d5d15fc5787e755f519af8
|
| |\ \
| | |/
| | |
| | | |
Change-Id: If2a4f50d03fccc2654b8336d9e40daea85d6adca
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is again trying to reproduce the issue described in the bug report,
but it also passes for me. Still, it's good to have this tested in
more depth.
Change-Id: Ibaaefd7359d558c3b59af3d86a1260ab06caa598
Task-number: QTBUG-54074
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Added a QMultiHash which maps transport objects to wrapped object ids.
transportRemoved iterates over all matching wrapped objects and removes
the passed transport object from their transports-vector. If the
transports-vector is empty after removing the passed transport object
the objectDestroyed will be called on the wrapped object.
transportRemoved will be called either on the transports destoryed
signal or on disconnecting the webchannel from it.
Without this changes the QMetaObjectPublisher::wrappedObjects and
::registeredObjectIds would only be cleaned up if the website calls
deleteLater on QObjects but not on website reloads.
Task-number: QTBUG-50074
Change-Id: If294564fee2406edd7fb578852aeb269cac23a92
Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
(cherry picked from commit fa2374d7c4dedea907e2df26fdad28bdee73b122)
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
|
| | |
| | |
| | |
| | | |
Change-Id: I5508bb77d24a5c1dcacf4d0dee57c31195c0a188
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Conflicts:
src/webchannel/doc/src/index.qdoc
src/webchannel/qwebchannelabstracttransport.cpp
Overlapping changes to documentation; constructed hybrid.
src/webchannel/qmetaobjectpublisher.cpp
tests/auto/webchannel/tst_webchannel.cpp
tests/auto/webchannel/tst_webchannel.h
Both sides made additions; in the same place.
Change-Id: Iff12970978b70946dc3e1290841aca2d35c9c1d0
|
| |\ \
| | |/
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
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>
|