summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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>
* 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.0' into 5.9Liang Qi2017-05-311-0/+23
|\ | | | | | | Change-Id: I65d79f799498f2a20fcf9161f529139483c50518
| * Add changes file for 5.9.0v5.9.0-rc2v5.9.0-rc1v5.9.05.9.0Antti Kokko2017-05-121-0/+23
| | | | | | | | | | | | | | | | 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>
* | Gracefully handle early deregistration of objectsMilian Wolff2017-05-153-2/+22
| | | | | | | | | | | | | | | | | | | | | | 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>
* | Bump versionOswald Buddenhagen2017-05-101-1/+1
| | | | | | | | Change-Id: I23bc6a2f8734b34ab5193a3ebcbebde3c98b2611
* | Fix licensingJani Heikkinen2017-05-057-1723/+24
|/ | | | | | | | | | | - 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>
* Merge remote-tracking branch 'origin/5.8' into 5.9v5.9.0-beta4v5.9.0-beta3v5.9.0-beta2v5.9.0-beta1Liang Qi2017-03-102-0/+5669
|\ | | | | | | Change-Id: Ica9ad5eb461d38cd5c40d7f7f22a81b55e427d87
| * Binary compatibility file for qtwebchannel (5.8.0)5.8Milla Pohjanheimo2017-02-031-0/+5641
| | | | | | | | | | | | | | | | Added binary compatibility file for qtwebchannel Change-Id: I4a5f32fe50ac08885b8eb574d3abe9b931c13040 Reviewed-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Sergio Ahumada <sahumada@texla.cl>
| * 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>
* | | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-259-24/+11067
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I601a28bfd7eb92d894295d7b7848b4a80dcc1d5d
| * | 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>
View Lorry Controller Status