summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump Qt version to Qt 6wip/qt6Alexandru Croitor2019-07-101-1/+1
| | | | | | Change-Id: I45a24634edcc267381c807fd99687473d14ccd44 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-292-25/+52
|\
| * Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-292-25/+52
| |\ |/ / | | | | Change-Id: I3cbdff6865eb04a7e1746927911aed635b8d21bf
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-282-25/+52
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-272-25/+52
| | |\ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I6c5ee0a59f5ba747611d8f6fdf97fdb7b88f97b9
| | * Stabilise flaky testDimitrios Apostolou2019-06-261-25/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Spread small delays in the test to mitigate severe flakiness on MacOS_10_12 platform in our CI. This is not a proper fix. It is acceptable because the module is deprecated and because it should greatly improve the instability of our CI. Fixes: QTBUG-76570 Change-Id: If2d7d15dffe23c7e0644b233e7757c04574c89d4 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| | * Merge "Merge remote-tracking branch 'origin/5.12.4' into 5.12"Qt Forward Merge Bot2019-06-172-1/+21
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.4' into 5.12Qt Forward Merge Bot2019-06-172-1/+21
| | | |\ | | |/ / | | | | | | | | Change-Id: I19610f79e1fd1f4b3033e6b11a3fef1f55c03a62
| | | * Add changes file for Qt 5.12.4v5.12.45.12.4Antti Kokko2019-05-231-0/+20
| | | | | | | | | | | | | | | | | | | | Change-Id: Id92e40dfd234f6bc2367131a17819c29cd4999a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Bump versionFrederik Gladhorn2019-05-231-1/+1
| | | | | | | | | | | | | | | | Change-Id: I7dd2516d56d49985154ad0f2f129646cffbeb721
* | | | Remove usages of deprecated QLatin1LiteralSona Kurazyan2019-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-76491 Change-Id: I7cde087044916a8f434c04182be34caa8ca37b17 Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-221-0/+18
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-221-0/+18
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: Id4d27bc912e28d21474aed9eee2ebf5c0df80e26
| * | | Merge "Merge remote-tracking branch 'origin/5.13.0' into 5.13"Qt Forward Merge Bot2019-06-201-0/+18
| |\ \ \
| | * \ \ Merge remote-tracking branch 'origin/5.13.0' into 5.13Qt Forward Merge Bot2019-06-201-0/+18
| | |\ \ \ | |/ / / / | | | | | | | | | | Change-Id: I25583d6e380b4b28ce226cda11307d656c7b1c8c
| | * | | Add changes file for Qt 5.13.0v5.13.0-rc3v5.13.0-rc2v5.13.0-rc1v5.13.0-beta4v5.13.05.13.0Antti Kokko2019-05-101-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieef4fa6ffb88aa7dbbdd539c62ac79c967d2bf3e Reviewed-by: Liang Qi <liang.qi@qt.io>
* | | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-112-1/+9
|\ \ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-112-1/+9
| |\ \ \ \ \ |/ / / / / / | | _ / / / | | / / / Change-Id: I679ecce0af8575e8f3aa27fba0b139ac000e54d9
| * | | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-06-081-1/+1
| |\ \ \ \
| | * \ \ \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-06-081-1/+1
| | |\ \ \ \ | |/ / / / / | | | | _ / | | | | / Change-Id: I8c71c934d005841d9512b29bd6d5285f966033f1
| | * | | Exclude the resources when building statically as qmake will handle thisAndy Shaw2019-05-281-1/+1
| | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As qmake will combine all the QML files etc together for us in static mode then we should not include those added to the resources explicitly in the pro file otherwise we will end up with an extra copy. Additionally, if qrc:/ was added to the import path list it would end trying to load the files from there and not from the qrc:/qt-project.org/imports location as a result. Change-Id: Icbaea7c6103074f9468914365b099be4589bee37 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Blacklist several failing tests in extras on MSVC 2019Shawn Rutledge2019-04-291-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-75276 Change-Id: I3b377588e58a613fcd37e5ec5ed39a9fc1cd996c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-06-031-1/+1
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-06-031-1/+1
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: Ie6006e2daf1ff578baf567aba8809df609a5dda5
| * | | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-05-281-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-05-281-1/+1
| | |\ \ | |/ / / | | | _ | | | Change-Id: Idc2e5ad567f83eb85d51d1e21c38bcd96436a24f
| | * Don't specify null to indicate an invalid QModelIndexAndy Shaw2019-05-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since this call is done on the C++ side, there is no means to equate null as being the same as QModelIndex(). As that is the default value when calling index(), we can just drop the argument in this case. Change-Id: I97b80064978b7af01f0606ed6f3778349adc4277 Fixes: QTBUG-74523 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-274-11/+42
|\ \ \ | |/ / | | | | | | Change-Id: I1eda6648cc10fd5e0d5148fd357ebb04135acc68
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-204-11/+42
| |\ \ | | |/ | | | | | | Change-Id: I4bb2b57f7f091074b0c4d17cad4748843e806dd0
| | * Merge remote-tracking branch 'origin/5.12.3' into 5.12Qt Forward Merge Bot2019-04-171-0/+34
| | |\ | | | | | | | | | | | | Change-Id: Ic6c8c79b7a38191221980f62936bb0f7135881b9
| | | * Add changes file for Qt 5.12.3v5.12.35.12.3Antti Kokko2019-04-051-0/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 46425199ebcdd4cb9facb471f67e17a941ca103f Fix blacklisting of auto tests + c901f6d2ee7f73f58881424b05d57360720fa7d9 Bump version + 1edf84eff083eb5412b4c5c7cd3bd8166f15f61f Dialog: Update the title on the window when changing it on the dialog Change-Id: I8ea33bd0ea313857aef450c9d4bf4ecd48dca257 Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
| | * | Create the decoration component when it is neededAndy Shaw2019-04-163-11/+8
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If multiple QQmlEngines are created and use a Dialog, initalizeEngine will be called more than once and therefore recreates the QQuickAbstractDialog::m_decorationComponent without deleting the original. Therefore we keep the decoration component url instead, and create the decoration component on demand. This ensures that it keeps the component relevant for the QQmlEngine and stops the memory leak from before as well. Fixes: QTBUG-75149 Change-Id: Ic79103f42d092d39b46868a45b4099ddc6edf9db Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-04-094-1/+86
|\ \ \ | |/ / | | | | | | Change-Id: I75d4dac714e023de38ec8f0327e42350f7e2a892
| * | Fix scroll position after resizev5.13.0-beta3v5.13.0-beta2Allan Sandfeld Jensen2019-04-081-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | We didn't update the position if it ended up with an invalid value. Fixes: QTBUG-63437 Change-Id: Idc4d3b0cb43fd63bdb0ff10b4162dfabe49455df Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-04-063-0/+80
| |\ \ | | |/ | | | | | | Change-Id: Ica2ac2d9c26eadad16509d0512817665566d829c
| | * Dialog: Update the title on the window when changing it on the dialogAndy Shaw2019-03-293-0/+80
| | | | | | | | | | | | | | | | | | Change-Id: Id9c60bf10bc0d4fb28ee9a027b84e395e9cb745c Fixes: QTBUG-74350 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-302-2/+32
|\ \ \ | |/ / | | | | | | Change-Id: I67c7f85c6743ee035e6e9051b3a5d402616eb964
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-270-0/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I8c72cfdfde1bef36bee9acdbc41652485a9f261e
| | * Bump versionKari Oikarinen2019-03-211-1/+1
| | | | | | | | | | | | Change-Id: I3d2d235fc7df5e437642213e4011b9162bf55af9
| * | Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-03-162-2/+32
| |\ \ | | |/ | | | | | | Change-Id: I3c0359e9e51bc1ee5b098d250c13c586e57b483c
| | * Merge remote-tracking branch 'origin/5.12.2' into 5.12Qt Forward Merge Bot2019-03-152-2/+32
| | |\ | | | | | | | | | | | | Change-Id: I8816a9d3e27cf79950b94fefd3bce86923c125c5
| | | * ScrollViewStyle: Avoid division by zero in extent computationv5.12.25.12.2Benjamin Robin2019-02-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the flickableItem content is empty (contentWidth / contentHeight is equal to 0), prevent the division by zero in the computation of the extent variable. Task-number: QTBUG-73691 Change-Id: I86becca9a1fa2508d1acafe09f46dfc952e4e96d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | | * Add changes file for Qt 5.12.2Antti Kokko2019-02-241-0/+30
| | | | | | | | | | | | | | | | | | | | Change-Id: I84ec16966ef9a06fde339d7f80dedcf95807cded Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-166-2936/+1135
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: If68b8b2994c77b5c66bc3f251a924bb8847542e1
| * | | Update plugins.qmltypes for Qt 5.13Kai Koehne2019-03-136-2936/+1135
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-73739 Change-Id: I4e25e1bef8640c0afe21c82217da114e77ba0cf7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-03-097-6/+45
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I038d33b06fe8e50da17262b9326975bc1f9bc747
| * | | Merge remote-tracking branch 'origin/5.12' into 5.13v5.13.0-beta1Qt Forward Merge Bot2019-03-027-6/+45
| |\ \ \ | | |/ / | | | | | | | | Change-Id: Ib614fd58e4df83945017bbb3bf2cbc9d5a72df4c
| | * | Fix blacklisting of auto testsOliver Wolff2019-02-281-0/+1
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | When doing shadow builds, the BLACKLIST file can only be found if QTEST_SET_MAIN_SOURCE_PATH is set. Fixes: QTBUG-74117 Change-Id: Icfb76c313800fefbb68f911779d5ef058b67cf40 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Update the CalendarHeaderModel when changing the locale setAndy Shaw2019-02-203-2/+14
| | | | | | | | | | | | | | | | | | Change-Id: I8af18ebfcc77f6080cfd5f0cade5042d0cd4a9a4 Fixes: QTBUG-73765 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Merge remote-tracking branch 'origin/5.12.1' into 5.12Qt Forward Merge Bot2019-02-011-0/+27
| | |\ | | | | | | | | | | | | Change-Id: Ib988d0deb1931a06fe96881e18760e7c52686bb0
View Lorry Controller Status