summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.11.2v5.11.25.11.2Antti Kokko2018-09-031-0/+24
| | | | | Change-Id: I5a7c1ab1f3cff52a7ce585f853efe6f9553d3f31 Reviewed-by: Michal Klocek <michal.klocek@qt.io>
* Add initial configure.jsonMichal Klocek2018-08-211-0/+3
| | | | | | | | | | | Add configure.json so qt configuration system knows about it. This is required to correctly configure dependency for webengine. Change-Id: I3547c190cdc54ec4a01984eed4dee4607f7be6a5 Reviewed-by: Jüri Valdmann <juri.valdmann@qt.io>
* Bump versionOswald Buddenhagen2018-07-301-1/+1
| | | | Change-Id: Iad611b0e9fd8899de297780bbaa09f206f03648f
* Merge "Merge remote-tracking branch 'origin/5.11.1' into 5.11" into ↵Qt Forward Merge Bot2018-06-191-0/+24
|\ | | | | | | refs/staging/5.11
| * Merge remote-tracking branch 'origin/5.11.1' into 5.11Qt Forward Merge Bot2018-06-191-0/+24
| |\ | | | | | | | | | Change-Id: I3f0fdb4defc9716771e8ef25803177ab9861f6be
| | * Add changes file for Qt 5.11.1v5.11.15.11.1Antti Kokko2018-06-131-0/+24
| |/ | | | | | | | | Change-Id: I63a17012f55985bc373f1039d817e676509cdff8 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Add changes file for Qt 5.9.6Antti Kokko2018-06-191-0/+24
| | | | | | | | | | | | | | Change-Id: I6e9b54ddcc8db636ee78a980d78200b534db96db Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io> (cherry picked from commit 56a155e68de96a80301ef8b9ad183fcb67e86142) Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | Add changes file for Qt 5.9.5Antti Kokko2018-06-191-0/+24
|/ | | | | | Change-Id: I4920fa7583713fa131334f0021a18f8f06157a11 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> (cherry picked from commit 887564cc04bc2d1946862fd4fb37db7df2cf0abe)
* Add binary compatibility file for 5.11 for QtWebChannelMilla Pohjanheimo2018-06-051-0/+5987
| | | | | | | File for bic test added Change-Id: I30402c0a82d1079443d0f2a09b67cd4142a046b4 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Bump versionOswald Buddenhagen2018-05-311-1/+1
| | | | Change-Id: Id9a9f824975e28b421e5f18f6d298165ec866eeb
* Use FDL license for all .qdoc filesKai Koehne2018-05-231-21/+9
| | | | | Change-Id: I039e3a47ca2c3889c3272f81fafb3997777881f6 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Doc: Add license details to index pageKai Koehne2018-05-141-0/+9
| | | | | Change-Id: I7ef0f2d7c760fcb4016e925ae5cd94fc158b53a6 Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* Merge remote-tracking branch 'origin/5.11.0' into 5.11Qt Forward Merge Bot2018-05-091-0/+22
|\ | | | | | | Change-Id: Iadbf05c21d66e5d5adfc2cd3bfa5142e2d5dc451
| * Add changes file for Qt 5.11.0v5.11.0-rc2v5.11.0-rc1v5.11.05.11.0Antti Kokko2018-04-251-0/+22
|/ | | | | Change-Id: I47501d2ca2535cf1d818c871e1e6a6bf9767e6f7 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Merge remote-tracking branch 'origin/5.9' into 5.11v5.11.0-beta4v5.11.0-beta3v5.11.0-beta2v5.11.0-beta1Liang Qi2018-02-180-0/+0
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I019bf0ed47b87a02796c4e092817d0777f9a2ece
| * Bump versionOswald Buddenhagen2018-02-021-1/+1
| | | | | | | | Change-Id: I3d437b343b5307d9b0f01c4930de01b27b2e8e7f
* | Merge remote-tracking branch 'origin/5.10.1' into 5.11v5.11.0-alpha1Liang Qi2018-02-141-0/+26
|\ \ | | | | | | | | | Change-Id: Iffc42e7d2f92dc4b0dfc4e523348e70940e412d8
| * | Add changes file for Qt 5.10.1v5.10.15.10.1Antti Kokko2018-02-061-0/+26
| | | | | | | | | | | | | | | | | | Change-Id: I4cb3f0446b2c0a398ef5a0a1d0b5e62d0016cbe4 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Milian Wolff <milian.wolff@kdab.com>
* | | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-205-4/+6080
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: tests/auto/webchannel/tst_webchannel.h Change-Id: I454c1bbab153405541e7fc41d1389a810b94f2db
| * | 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>
* | | | Merge remote-tracking branch 'origin/5.10' into devLars Knoll2018-01-033-3/+49
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I2e72cb69fb077e22571ce4bdc69abace00c37e7a
| * | | 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.10' into devLiang Qi2017-11-205-12/+41
|\ \ \ | |/ / | | | | | | Change-Id: I5fb1c52b54156c53719734fae7625dd7e1941fed
| * | 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.10' into devLiang Qi2017-09-2226-290/+670
|\ \ \ | |/ / | | | | | | Change-Id: I0b7d3d5789c0c3ef11d96c83c3f61d0de65f3593
| * | 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>
View Lorry Controller Status