summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/5.9' into 5.105.10Liang Qi2018-01-184-4/+98
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Id5d79a1cd456c79ef35a323d1a8713facde2ef91
| * Merge remote-tracking branch 'origin/5.9.4' into 5.9Liang Qi2018-01-181-3/+3
| |\ | | | | | | | | | Change-Id: Ib5e52f5be22b5a6430c4dfe731b0a0fe74ba0617
| | * Clean up TestWebChannel::testAsyncObjectv5.9.45.9.4Sami Nurmenniemi2018-01-091-12/+3
| | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-63152 Change-Id: I22df2328f0ab6d2a2d12458dbeaec68bfbe36985 (cherry picked from commit 5a9dd81f260f320b5af108c1a6b3d0b82a04f15d) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * Fix TestWebChannel::testAsyncObjectSami Nurmenniemi2018-01-091-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If signal is emitted directly, QSignalSpy::wait() is called too late. In that case the correct information about emitted signal can be checked with QSignalSpy::count(). Task-number: QTBUG-63152 Change-Id: I0c3da52ab17f9138ad1a7a17f5065b8a87911b8f (cherry picked from commit d2f9396f048ef8fdd494626d92b3d7106fb10304) Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| * | Allow deleting a channel during method invocationJüri Valdmann2018-01-083-4/+73
| |/ | | | | | | | | | | | | | | | | | | | | | | | | A real-life use case is the session restore page in KDE Falkon or, more generally, any kind of closeTab() method exposed to JS in a QWebEnginePage. The approach taken in this patch will only work if the transport can also deal with deletion during a messageReceived signal emission. Alternatively, method invocation could be delayed via the event loop, but this would come with an obvious performance penalty. Change-Id: I2940f61e07c77365f6e3e7cd29463d4cb5b525a6 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Add changes file for Qt 5.9.4Antti Kokko2018-01-051-0/+25
| | | | | | | | | | Change-Id: I45a8551cd6ae0e8531cfde1de95d25d2e2494aea Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Bump versionOswald Buddenhagen2017-12-121-1/+1
| | | | | | | | Change-Id: Ie8406d47cd22d913ef481bbf3bf9eda5e3f2a4d7
| * Merge remote-tracking branch 'origin/5.9.3' into 5.9Liang Qi2017-11-231-0/+24
| |\ | | | | | | | | | Change-Id: I6f5b329e6ee6c036bea9917a68b5df444ff9a8f9
* | | Add binary compatibility file for QtWebChannel for 5.10Milla Pohjanheimo2018-01-091-0/+5982
| | | | | | | | | | | | | | | | | | | | | | | | File to test binary compatibility for 5.10 for QtWebChannel added Change-Id: I9697c942895106098b61639604faa0f94871dfcf Reviewed-by: Sergio Ahumada <sahumada@texla.cl> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | | Clean up TestWebChannel::testAsyncObjectSami Nurmenniemi2017-12-291-12/+3
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-63152 Change-Id: I22df2328f0ab6d2a2d12458dbeaec68bfbe36985 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Fix TestWebChannel::testAsyncObjectSami Nurmenniemi2017-12-281-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If signal is emitted directly, QSignalSpy::wait() is called too late. In that case the correct information about emitted signal can be checked with QSignalSpy::count(). Task-number: QTBUG-63152 Change-Id: I0c3da52ab17f9138ad1a7a17f5065b8a87911b8f Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | | Bump versionOswald Buddenhagen2017-12-201-1/+1
| | | | | | | | | | | | Change-Id: Id968066c681217f4f441befaecba63e3bf16128f
* | | Merge remote-tracking branch 'origin/5.10.0' into 5.10Liang Qi2017-12-082-0/+46
|\ \ \ | | | | | | | | | | | | Change-Id: I6b0be62459ae5450775415b4468135002cf47b47
| * \ \ Merge remote-tracking branch 'origin/5.9.3' into 5.10.0v5.10.0-rc3v5.10.0-rc2v5.10.0-rc1v5.10.05.10.0Liang Qi2017-11-211-0/+24
| |\ \ \ | | | |/ | | |/| | | | | Change-Id: I5efecfc663913c795dad7f475cc0a9244034e1dd
| | * | Add changes file for Qt 5.9.3v5.9.35.9.3Antti Kokko2017-11-131-0/+24
| | |/ | | | | | | | | | | | | Change-Id: Ie68f0db2f82cc6a258dc20f43f3662490dd175dc Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Add changes file for Qt 5.10.0Antti Kokko2017-11-201-0/+22
|/ / | | | | | | | | Change-Id: I3362bd81d9f48b436c3b9c83b54190380b985513 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta4Liang Qi2017-10-305-12/+41
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I7c3237feec1602fcdd9034e81579fe192f3eabb1
| * Bump versionOswald Buddenhagen2017-10-061-1/+1
| | | | | | | | Change-Id: I50680ec5ad29fb1bf61af594a25c5901a9b3f915
| * Merge remote-tracking branch 'origin/5.9.2' into 5.9Liang Qi2017-10-061-0/+29
| |\ | | | | | | | | | Change-Id: I099e844e1699519e25324ce9e80b6074fced7dad
| | * Add changes file for Qt 5.9.2v5.9.25.9.2Milian Wolff2017-09-221-0/+29
| | | | | | | | | | | | | | | | | | Task-number: QTBUG-62756 Change-Id: Id5e0bcc7ef329ae183049a5b7beed0dea91b1504 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
| * | Fix outdated FDL headerKai Koehne2017-09-294-12/+12
| |/ | | | | | | | | Change-Id: I5a200b078a6d3485cd6277f79902aca8021b6770 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge remote-tracking branch 'origin/5.9' into 5.10v5.10.0-beta3v5.10.0-beta2v5.10.0-beta1Liang Qi2017-09-2026-291/+671
|\ \ | |/ | | | | Change-Id: I54f0bcd46ffb496156e46d723275cdd29601e45c
| * Highlight standalone exampleKai Koehne2017-09-141-0/+2
| | | | | | | | | | | | | | | | Highlighted examples will show up prominently in the Qt Creator Welcome screen. Change-Id: I59f55ff9e3e7ff737dcbe22b9265eb7149588358 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * qmlchatclient: Make main window visible by defaultKai Koehne2017-09-121-0/+1
| | | | | | | | | | Change-Id: I054299ae46364d37655db76d533432ad84372a7c Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Fix class name in standalone documentationKai Koehne2017-09-121-3/+3
| | | | | | | | | | | | | | This amends change 13294ce605751babad0687e63c033436d129e3d2 Change-Id: I1e819a5d952329985741a558aef47e50a4bd5e7e Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Make chatclient-qml designer-friendlyKai Koehne2017-09-124-69/+209
| | | | | | | | | | Change-Id: Ibebe78a8bf2ec0147ece31c5895a78415f12c855 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * chatclient-qml: Show errors in a dialogKai Koehne2017-09-121-6/+21
| | | | | | | | | | | | | | | | | | If the socket is closed the error was so far written to a non-existing element. Show a modal dialog then, instead. Also, do not make the login window visible until we have established a connection. Change-Id: I5045f8583a396f22b751e65b8bb73c609b51c9be Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Give example a meaningful window titleKai Koehne2017-09-121-1/+1
| | | | | | | | | | Change-Id: Id4e4cabe429f00360d1f357183cfbe0ac1ebb5ef Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Chatclient-qml: Use QtQuick.Controls 2Kai Koehne2017-09-121-1/+1
| | | | | | | | | | | | | | Let's promote the newer version also in the examples. Change-Id: I903e2aab0bff6fa397c5d35d44b88ee947851f58 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Beautify code of qmlchatclient exampleKai Koehne2017-09-121-50/+68
| | | | | | | | | | | | | | | | | | Follow http://doc.qt.io/qt-5/qml-codingconventions.html This does not change behavior. Change-Id: Ic0e9aa20e9954cd459c4e0b59b67eadcaebd4e47 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Examples: beautify JavaScript snippetsKai Koehne2017-09-085-65/+69
| | | | | | | | | | Change-Id: I3499bfa49e79ed3664d020f7de0e691afeb15a86 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Split up classes in standalone exampleKai Koehne2017-09-086-71/+267
| | | | | | | | | | Change-Id: Ie58e8914415f42b0b4d52106b343e152ba9e7565 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Examples: Use canonical include style and sort #includeKai Koehne2017-09-066-19/+15
| | | | | | | | | | | | | | See also https://wiki.qt.io/Writing_Qt_Examples Change-Id: Ife2300b9f1a074e9dc418d53f8c47138129b0cc7 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Allow examples to be built without module sourcesKai Koehne2017-09-063-10/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qwebchannel.js is used by examples, which so far tried to copy it directly from the library source directory. However, in the case of an installed prefix build of Qt, the library sources are not available. This patches therefore moves the qwebchannel.js file to the examples directory, which is installed including sources. The obvious alternative would be copying the file inside the source tree, but that causes code duplication and a maintenance burden that we want to avoid. Another alternative would have been to install qwebchannel.js into QT_INSTALL_DATA, or extract the file at build time from the Qt library. However, this requires bigger changes, and is also dubious because the use case are in particular applications _not_ using Qt. Task-number: QTBUG-57654 Change-Id: I96bc93b6e3d248e4b4facdd582d9fa53ae562924 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Add change file for Qt 5.6.3Milian Wolff2017-09-061-0/+28
| | | | | | | | | | | | Task-number: QTBUG-62718 Change-Id: I9bf9789f2d8613d0a681a2cdb2841f142a9f6356 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
| * Examples: Fix coding style issuesKai Koehne2017-08-293-11/+11
| | | | | | | | | | Change-Id: Ifdd0a9117bc354c342728949e45d1ac431495ef4 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Examples: Use Qt 5 connectKai Koehne2017-08-292-3/+3
| | | | | | | | | | Change-Id: I33aa6f8244770bf19b45f69cfc62a5469168418d Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Examples: Use override keywordKai Koehne2017-08-291-1/+1
| | | | | | | | | | | | | | Every C++11 compliant compiler has to support it. Change-Id: I143647aaeba6d49f9ab48abaffad0d77a8abbffd Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Examples: Use signals and slots keywordsKai Koehne2017-08-292-3/+3
| | | | | | | | | | | | | | Examples are not compiled with QT_NO_KEYWORDS. Change-Id: I6bff2b4cc46bd53ef2f1879951e59089734a3864 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Examples: Use nullptrKai Koehne2017-08-293-3/+3
| | | | | | | | | | Change-Id: I93688ed891e1cdd6815af0ea22507190c34c0bba Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Examples: Use canonical include guardsKai Koehne2017-08-292-6/+6
| | | | | | | | | | Change-Id: I0806cb50a46da19e3538855b348cbdaa2c4f96e1 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
| * Examples: Do not put example code in Qt namespaceKai Koehne2017-08-296-22/+6
| | | | | | | | | | | | | | | | Instead just wrap forward-declared Qt classes. See also https://wiki.qt.io/Writing_Qt_Examples Change-Id: I3707bb6ee5577e49a6b860e8f1c21b6aaf6405c2 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1Liang Qi2017-08-155-12/+5726
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibf86cdf744d1081f40f734e4a30ca24581e1cc2d
| * Do not crash on non-QVariant return typesMilian Wolff2017-08-083-12/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * Merge remote-tracking branch 'origin/5.9.1' into 5.9Liang Qi2017-06-301-0/+24
| |\ | | | | | | | | | Change-Id: I93431a20912046a951d2e8f25471b3533a459241
| | * Add changes file for 5.9.1v5.9.15.9.1Jani Heikkinen2017-06-231-0/+24
| | | | | | | | | | | | | | | Change-Id: I52fe90748f5f07a51b477eae4d72a9941646814b Reviewed-by: Lars Knoll <lars.knoll@qt.io>
| * | Bump versionOswald Buddenhagen2017-06-301-1/+1
| | | | | | | | | | | | Change-Id: If2f94cf279858115eab6033859d29d2636965c03
| * | Update binary compatibility file for Qt5.9.0 for QtWebChannelMilla Pohjanheimo2017-06-301-0/+5661
| |/ | | | | | | | | | | | | Binary compatibility file for Qt 5.9.0 updated. Change-Id: Ie1486ba7e4777fe88b03697f10ee6069f71ea575 Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
* | Merge remote-tracking branch 'origin/5.9' into devLiang Qi2017-06-0713-1725/+5738
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ibd56abaa0b9d9aac275be41209ba2db3fc79e212
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-311-0/+23
| |\ | | | | | | | | | Change-Id: I65d79f799498f2a20fcf9161f529139483c50518
View Lorry Controller Status