summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-261-0/+28
|\ | | | | | | Change-Id: I61aae1bc9363fa234bafc730e1f60eb3b05114cc
| * Add changes file for 5.8.0v5.8.0-rc1v5.8.05.8.0Antti Kokko2016-12-151-0/+28
| | | | | | | | | | Change-Id: Ide462548e58ebd60b4049858754f9d1b56fd44a8 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Bump versionOswald Buddenhagen2017-01-031-1/+1
|/ | | | Change-Id: Ic324e77322de09c4b6b47a1300d024c88bb6f6ae
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-269-24/+11067
|\ | | | | | | Change-Id: I09a494a9b94ce169d60e77f4bffa8845db01293a
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-243-13/+5329
| |\ | | | | | | | | | Change-Id: I773dacf2a5513327db8be0837e7514685cbd1dc4
| | * remove dependencies from sync.profileOswald Buddenhagen2016-11-061-13/+0
| | | | | | | | | | | | | | | | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: If99fe829b8c17802d1b9a7a4a12d9dfe98c54e73 Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
| | * BC include file and global.cfg added for QtWebChannelMilla Pohjanheimo2016-10-132-0/+5329
| | | | | | | | | | | | | | | | | | | | | Means to run the binary compatibility (BC) test for QtWebChannel added Change-Id: I6684b34d10c44340aa852bf9eae81b35e1ae4d2b Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * | Merge remote-tracking branch 'origin/5.7.1' into 5.7Liang Qi2016-11-241-0/+27
| |\ \ | | | | | | | | | | | | Change-Id: I5a2028d705c3ba57c9bd770286ae6aa3d24a9513
| | * | Add changes file for 5.7.1v5.7.15.7.1Jani Heikkinen2016-11-011-0/+27
| | | | | | | | | | | | | | | | | | | | Change-Id: Id51e16ae5bc9592eacad75642e408e1743416af8 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | | BC file added for QtWebChannel (5.7)Milla Pohjanheimo2016-10-141-0/+5606
| |/ / | | | | | | | | | | | | | | | | | | Binary compatibility (BC) file for QtWebChannel added Change-Id: I4de49243be8d77eb0295b653dba2dd75379361fa Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-10-014-11/+105
| |\ \ | | |/ | | | | | | Change-Id: Ib8b5300d27583018bc7582be41140dfda0ab5309
| | * Fix asynchronous signals from QObjects in different threadsDave Andrews2016-09-293-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Fix asynchronous method calls on QObjects in different threadsDave Andrews2016-09-293-10/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Fix loading of QML pluginsv5.8.0-beta1v5.8.0-alpha1Simon Hausmann2016-08-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-037-26/+188
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/webchannel/tst_webchannel.cpp tests/auto/webchannel/tst_webchannel.h Change-Id: I01b0f58c10acbef8e2d5d15fc5787e755f519af8
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-0110-4/+255
| |\ \ | | |/ | | | | | | Change-Id: If2a4f50d03fccc2654b8336d9e40daea85d6adca
| | * Add a test that emits signals from C++ and checks them in QMLv5.6.25.6.2Milian Wolff2016-07-215-3/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Remove deleted transport objectsKai Dohmen2016-07-215-1/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Bump versionOswald Buddenhagen2016-07-281-1/+1
| | | | | | | | | | | | Change-Id: I5508bb77d24a5c1dcacf4d0dee57c31195c0a188
* | | Merge remote-tracking branch 'origin/5.7' into devEdward Welbourne2016-07-2127-115/+556
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Edward Welbourne2016-07-1516-64/+409
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * Add test to verify that bools get properly converted.Milian Wolff2016-07-132-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Properly unwrap QObject signal parameters on the JavaScript side.Milian Wolff2016-06-282-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Make passing objects from website to server possibleKai Dohmen2016-06-215-27/+122
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-154-4/+4
| | | | | | | | | | | | | | | | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: I84346b304041f23abe6f1b99d8681199b03e57f4 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| | * Doc: Fix linking to methods and properties within the typeLeena Miettinen2016-06-011-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Doc: Use 3rd person singular verb form to begin method docsLeena Miettinen2016-06-011-4/+5
| | | | | | | | | | | | | | | | | | | | | And fix a typo "connectect". Change-Id: I14c4b249af3cad142a5f6042b2059f653a9c3eae Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| | * Doc: Use standard verb form to start function docsLeena Miettinen2016-05-312-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | For consistency, the first verb should be in 3rd person singular form. Change-Id: I5e24ecbbac1b1ab85e737f127b021f24a55c8dd4 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| | * Doc: Fix links to other modulesLeena Miettinen2016-05-313-13/+11
| | | | | | | | | | | | | | | | | | | | | -Remove references to Qt WebKit Change-Id: I0bd184021b1a87828e93f5783c38b9ba97f37763 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| | * Doc: Edit the index pageLeena Miettinen2016-05-311-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| | * Doc: Edit example documentationLeena Miettinen2016-05-3110-48/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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>
| | * Fix setting properties of QJson{Value,Array,Object} type.Milian Wolff2016-05-264-12/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * Enable calling C++ functions taking QJson arguments via webchannel.Milian Wolff2016-05-253-5/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| | * do not enable example installs explicitly any moreOswald Buddenhagen2016-05-241-1/+1
| | | | | | | | | | | | | | | | | | | | | it's done centrally now. Change-Id: I0922b2083b594cdf61f4606fe17c9c61c0d4683a Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * | Merge remote-tracking branch 'origin/5.7.0' into 5.7Liang Qi2016-06-1611-50/+146
| |\ \ | | | | | | | | | | | | Change-Id: If663d043ad0da98731e436309d3b40e3379b0831
| | * | Mention license change in 5.7.0 changelog.v5.7.05.7.0Kai Koehne2016-06-081-2/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9120c4d9c6cf08cdaaec468a514e2ab060abde35 Task-number: QTBUG-53913 Reviewed-by: Sami Makkonen <sami.makkonen@qt.io> Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Doc: Edit example documentationLeena Miettinen2016-06-0210-48/+128
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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)
* | | Remove deleted transport objectsKai Dohmen2016-05-315-1/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-05-2412-18/+82
|\ \ \ | |/ / | | | | | | Change-Id: Ica9ff8d7142c5bd5328d44505beb8c22b4c21766
| * | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1Liang Qi2016-05-1911-18/+61
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I52dc7e8ad7a9ce6fa36ad2d6ce5d8ea29b77b400
| | * Bump versionOswald Buddenhagen2016-05-191-1/+1
| | | | | | | | | | | | Change-Id: I73f3738a4ba90af8bc8572edecda56bec7d1f60b
| | * Doc: Remove repository name from examplesinstallpathv5.6.1-1v5.6.15.6.1Topi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | Examples in binary packages now directly match the install path. Change-Id: I06c85e42d312bd6a1e1ae619330676b717b6ccbd Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| | * make use of COPIESOswald Buddenhagen2016-04-281-12/+4
| | | | | | | | | | | | | | | Change-Id: Ic3979ec70b7ddf7d01d0873c00b7739c5f0ef3c9 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| | * fix example installsOswald Buddenhagen2016-04-287-5/+14
| | | | | | | | | | | | | | | Change-Id: Iccf9f6e0e9358ba42576fb67a0b356c7414d911e Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| | * Also add changes file for 5.6.1 release.Milian Wolff2016-04-271-0/+21
| | | | | | | | | | | | | | | Change-Id: I509dbfd09d64d8b2a3e9ff17893e99d78a9186f8 Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>
| | * Add changes-5.6.0.Milian Wolff2016-04-271-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | Add changes-5.7.0.Milian Wolff2016-05-121-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Clarify the module descriptionFrank Meerkoetter2016-04-251-8/+7
| | | | | | | | | | | | | | | Change-Id: Ib651958ec7aa12eb205a11a515fa9a464e254bd0 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | | Add QStringLiteralFrank Meerkoetter2016-04-131-1/+1
| | | | | | | | | | | | | | | Change-Id: I38ddf1dd4af4e350a11288eebdfd3c3ee1dc5fe9 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | | Fix include orderFrank Meerkoetter2016-04-132-9/+4
| | | | | | | | | | | | | | | | | | | | | Includes go from most specific to least specific Change-Id: I86aa972dbb09a31142c443dd88f1930e91bf2803 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
View Lorry Controller Status