summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add changes file for Qt 5.14.2v5.14.25.14.2Antti Kokko2020-03-111-0/+20
| | | | | | | | + def0972bf32bb22d5123f409e17f9e92f3809bf4 Stop using QDateTime's locale-specific APIs + caecffab98cb2c47140579712e5b7bc7f7ce3070 Bump version Change-Id: Ia2f013f5636a5b811d37fac78f558b56b26edbdb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Bump versionAlexandru Croitor2020-02-021-1/+1
| | | | Change-Id: I2adee7799f1c8d762cdea06f9bcd4edb51d783ca
* Stop using QDateTime's locale-specific APIsEdward Welbourne2020-01-281-1/+1
| | | | | | | | Use QLocale's date-time APIs, instead. Task-number: QTBUG-80441 Change-Id: I75453a002e0eea299d0527c0fa9431dc8bc53c7f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Merge remote-tracking branch 'origin/5.14.1' into 5.14Qt Forward Merge Bot2020-01-273-4/+45
|\ | | | | | | Change-Id: I26504ec0e2a0ea6ec3373394ea51132b65982c92
| * Merge 5.14 into 5.14.1v5.14.15.14.1Kari Oikarinen2020-01-152-4/+1
| |\ | |/ |/| | | Change-Id: I91a981474478b244f956497347155d5c44e4fc84
* | Doc: Remove \internal command from a \qmlabstract typeTopi Reinio2020-01-102-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | Even though the type is private, other types inheriting from it must also inherit the property documentation. \qmlabstract handles this, but only if the abstract type is not \internal. Remove incorrect links that were trying to fix the issue previously. Fixes: QTBUG-79469 Change-Id: I9b9bb0af84abf44c5cbe9e1770659cff24834dd6 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| * Android: Look in the correct location for the supporting QML filesAndy Shaw2020-01-152-4/+25
| | | | | | | | | | Change-Id: I99db8554f88d39a2e9376b50bb1a6f8a334cf461 Reviewed-by: BogDan Vatra <bogdan@kdab.com>
| * Add changes file for Qt 5.14.1Antti Kokko2020-01-091-0/+20
|/ | | | | | | | + 52e5dc73b3f61e0453eb939314c3ea67b02ce7e3 Doc: Add a note about the deprecated controls 1 + fbc0fe81fad9fbc80180503ad439f1db0a698a9e Bump version Change-Id: I871d50375f402f14153c5b26695aff644b32d85a Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
* Bump versionDaniel Smith2019-12-161-1/+1
| | | | Change-Id: Id2746353959076424fe4b43a228e22512f60ca54
* Merge remote-tracking branch 'origin/5.14.0' into 5.14Qt Forward Merge Bot2019-12-131-0/+28
|\ | | | | | | Change-Id: Iadd8ea7d5a6c7557a795ccffa1719794dda260b5
| * Merge 5.14 into 5.14.0v5.14.0-rc2v5.14.0-rc1v5.14.05.14.0Kari Oikarinen2019-11-261-3/+3
| |\ | | | | | | | | | Change-Id: Ib7231d4458c8ede386044df356adf935e14d98b4
| * \ Merge 5.14 into 5.14.0Frederik Gladhorn2019-11-2118-58/+65
| |\ \ | | | | | | | | | | | | Change-Id: Ib75e2e1d50e88c7e22a5bba34159c4e1af35ccbc
| * | | Add changes file for Qt 5.14.0Antti Kokko2019-11-191-0/+28
| | | | | | | | | | | | | | | | | | | | Change-Id: I295905d1b4e77ecf9540dab3854ac38748d9f457 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Doc: Add a note about the deprecated controls 1Venugopal Shivashankar2019-12-057-0/+37
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | This will help readers who will end up on the Controls 1 pages through a web search. Change-Id: I9c40f6c66c72e5a456dd903485133c64cb386f8f Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | tst_tumbler.qml: fix failing test_currentIndex() testMitch Curtis2019-11-261-3/+3
| |/ |/| | | | | | | | | | | | | | | Use correct (i.e large enough distance) to ensure the current index changes. Fixes: QTBUG-80152 Change-Id: I26873e83fbd520965495104177ba09a38f566257 Reviewed-by: Liang Qi <liang.qi@qt.io>
* | Doc: Fix documentation warningsTopi Reinio2019-11-1418-58/+65
|/ | | | | | | | | | | | | | | | | All warnings in qtquickcontrols were related to \qmlmethod or \qmlsignal parameters, except for the missing dependency to qtcore in Qt Quick Extras. There's some inconsistencies with how QDoc parses QML method parameters, especially for qml signals - in some cases the \a command is replaced with \e to clear the warning, even though the parameter name referenced with \a does exist. This commit brings the current warning count to zero. Fixes: QTBUG-79828 Change-Id: I3d3d02583498c5a579f6476273e10e75680d940c Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Add missing depends entry for QtQmlAndy Shaw2019-11-064-0/+4
| | | | | | | Fixes: QTBUG-79794 Change-Id: I1095563250cf872080843670ad1d92b896db38a3 Reviewed-by: Paolo Angelelli <paolo.angelelli@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.13' into 5.14v5.14.0-beta3Qt Forward Merge Bot2019-11-044-35/+392
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ide73d291e885a0455765263716ea2b972d7ae62b
| * Merge remote-tracking branch 'origin/5.13.2' into 5.135.13Qt Forward Merge Bot2019-10-302-1/+21
| |\ | | | | | | | | | Change-Id: Icb6da7c1d662261ec1b80fbd54d1b9dc7b573824
| | * Add changes file for Qt 5.13.2v5.13.25.13.2Antti Kokko2019-10-171-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | + b37db1f31b3248e9d32d0ccbb42e77035fa5b340 Add changes file for Qt 5.12.5 + da94d6586cbe6b9c12dec8ecc0f842aad807b0d3 Only calculate the height of the ListView when there are model entries + 7f61a351148c7d67f8f4ee6f2d2c4a9c53766297 Remove test_resizeAfterFlicking from tst_tumbler Change-Id: I7bd32e2f04223df753615b0b3315244cef46e316 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * Bump versionFrederik Gladhorn2019-10-141-1/+1
| | | | | | | | | | | | Change-Id: I6de0ffd4952bcecbcf92ff925d450ba4c4beb45f
| * | QQuickTreeModelAdaptor1: fix updating of ModelIndex roleAlberto Mardegan2019-10-293-35/+372
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The decision to store the original QModelIndex as a role has the unfortunate consequence that we need to emit the dataChanged() signal whenever its value change. The previous implementation of the "move rows" operation failed in delivering this update in most cases. While addressing that, this commit also fixes some similar issues with the HasChildren role not being notified in certain scenarios. Also, when the last child of an expanded item gets moved away and later placed back in the original position, the item should not remember its expanded state, but rather accept the children while staying collapsed. Last but not least, it's important that the endMoveRows() protected method is called *after* the original tree model has completed its movement, because otherwise its elements might be accessed while in the wrong state. Similarly, we don't want the dataChanged() signals to be emitted while rows are moved or removed; we queue up these events and fire them only after the item indexes have settled. Fixes: QTBUG-59606 Change-Id: Ib981c912ea19908e1283cc463331c3053d4d6e7d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Update plugins.qmltypes for 5.14Kai Koehne2019-10-234-715/+714
| | | | | | | | | | | | Task-number: QTBUG-78690 Change-Id: I3d6c4c3239107b25731d8e355c774a6b8b70a601 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"v5.14.0-beta2Liang Qi2019-10-141-35/+0
|\ \
| * \ Merge remote-tracking branch 'origin/5.13' into 5.14Liang Qi2019-10-141-35/+0
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: tests/auto/extras/data/tst_tumbler.qml Change-Id: Ia8b373767a311e973e3b171109b6b8b6c33f82b0
| | * Remove test_resizeAfterFlicking from tst_tumblerMitch Curtis2019-10-091-35/+0
| | | | | | | | | | | | | | | | | | | | | | | | This is causing flakiness in CI, and tests a weird edge case, so its value as a test is very low. Change-Id: Iaeb2633bd270dc8e88420ace5efe9ab156339733 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | Blacklist Tests_TableView::test_headervisible on macosUlf Hermann2019-10-141-0/+3
|/ / | | | | | | | | | | Task-number: QTBUG-79161 Change-Id: I94f2d7bb16db92fcce87086c9abf8b4b0a39f792 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Make restoreMode on all Binding elements explicitUlf Hermann2019-10-0424-57/+233
| | | | | | | | | | | | | | The default is going to change in 5.15. Change-Id: Ib17500791476bd45ed2c7c3736186897fb63d7a0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Android: Always load qml files from resourcesv5.14.0-beta1BogDan Vatra2019-10-013-10/+19
| | | | | | | | | | | | | | | | | | | | | | The QML files on Android are now available in :/android_rcc_bundle/qml folder, this way we don't need to extract them at very first start up. [ChangeLog][Android] Always load qml files from resources (:/android_rcc_bundle/qml) Change-Id: Ib905e5d5e1577d99bb89e7e0d237fa8b24a1e95f Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-281-1/+1
|\ \
| * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-281-1/+1
| |\ \ |/ / / | | _ | | Change-Id: I5c3215469c4b5f45943e8937e8b1eb309c6aed92
| * Only calculate the height of the ListView when there are model entriesAndy Shaw2019-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | When it tries to calculate the height of the listview then it depends on the model having entries. If there is no model or no entries in it then it will cause a warning to be outputted indicating that the model size is less than 0. This prevents it from occurring as a result. Fixes: QTBUG-72543 Change-Id: I7155a3a240fdcdf93caddfce332f0cc6bb0f0ec0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Guard against flickableItem being null when scrollingUlf Hermann2019-09-261-1/+1
| | | | | | | | | | | | | | | | | | | | Fixes error from qmlplugindump: ScrollViewHelper.qml:147: TypeError: Cannot read property 'originX' of null Change-Id: I1bef74acda8fb4e1850967c4d684ece7d458699b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | tst_tumbler: adapt test after changes to PathViewMitch Curtis2019-09-251-2/+1
| | | | | | | | | | | | | | | | | | | | | | 3df387d63421f09533ab72e2a73fb5d259693120 changed the flicking behavior of PathView slightly, so we need to adapt this test to reflect those changes. Fixes: QTBUG-78471 Change-Id: I093bfea9a4d089b4f61c405ab41aa1f4ea77d422 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | tst_tumbler: temporarily disable a test to let qtdeclarative change inv5.14.0-alpha1Liang Qi2019-09-191-1/+2
| | | | | | | | | | | | | | | | | | 3df387d63421f09533ab72e2a73fb5d259693120 changed the flicking behavior of PathView slightly. Task-number: QTBUG-78471 Change-Id: I403f06bed8c790196e5fc8c3ec8f3ea59b91f23e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.13' into 5.14"Qt Forward Merge Bot2019-09-172-0/+40
|\ \
| * \ Merge remote-tracking branch 'origin/5.13' into 5.14Qt Forward Merge Bot2019-09-172-0/+40
| |\ \ |/ / / | | _ | | Change-Id: I7fd8b4fa79b25e4e5753d37749233bed942bef7f
| * Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-09-081-0/+20
| |\
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-081-0/+20
| | |\ | |/ / | | | | | | Change-Id: I9632a4f67cd4f96b0b5ad8010266463525f1f6e7
| | * Merge "Merge remote-tracking branch 'origin/5.12.5' into 5.12"Qt Forward Merge Bot2019-09-071-0/+20
| | |\
| | | * Merge remote-tracking branch 'origin/5.12.5' into 5.12Qt Forward Merge Bot2019-09-071-0/+20
| | | |\ | | |/ / | | | | | | | | Change-Id: Ia5eba4c810e06c4b73daf6e27a8c5ce141ce6ebb
| | | * Add changes file for Qt 5.12.5v5.12.55.12.5Antti Kokko2019-08-261-0/+20
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | + 0f74e642bf1f13f6b097b1a8e1412ca3cb6e85b5 Exclude the resources when building statically as qmake will handle this + 558eb844d59185d944c233348d2fef649e90b643 Stabilise flaky test + dc9ccfb331119d319c7a620c075d04355e4745cf Skip Tests_ScrollView::test_dragFetchAppend + 4e156bb26fb904663b0e13df1802dc2e0788b114 Bump version Change-Id: If7cca454f9f14edb8523848d038c70027f561c23 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Merge "Merge remote-tracking branch 'origin/5.13.1' into 5.13"Qt Forward Merge Bot2019-09-051-0/+20
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.13.1' into 5.13Qt Forward Merge Bot2019-09-051-0/+20
| | |\ \ | |/ / / | | | | | | | | Change-Id: Id04c036339450cb079c91df1716aa0cbe8a8b635
| | * | Merge 5.13 into 5.13.1v5.13.15.13.1Paul Wicking2019-08-061-0/+2
| | |\ \ | | |/ / | |/| | | | | | Change-Id: Ic8aa394d28a116b80c257b330d294ff016f173dd
| | * | Add changes file for Qt 5.13.1Antti Kokko2019-07-311-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 4acab46571b793d7a00c9fe768d9ca91a47ea6bb Blacklist several failing tests in extras on MSVC 2019 + 84fbb48832e984c7fce1c4091adb0d340974a75f Don't specify null to indicate an invalid QModelIndex + 87f79ca0cfe432b7758fa19472cc7133275818c5 Bump version + 8105e3ed0e77f363ccc6406edd38082ac5cef27d Add changes file for Qt 5.12.4 + 0f74e642bf1f13f6b097b1a8e1412ca3cb6e85b5 Exclude the resources when building statically as qmake will handle this + 558eb844d59185d944c233348d2fef649e90b643 Stabilise flaky test + dc9ccfb331119d319c7a620c075d04355e4745cf Skip Tests_ScrollView::test_dragFetchAppend + 0ee7134d24bccb965a134dd1f4267a0bfda3de61 Bump version + 4e156bb26fb904663b0e13df1802dc2e0788b114 Bump version + 42812dfd813745beed928e40621ae9deb88a9247 Doc: Replace example file lists with links to code.qt.io Change-Id: I72cf998aac4f64b7eee176466466994f28572ca9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-08-031-0/+2
|\ \ \ \
| * \ \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-08-031-0/+2
| |\ \ \ \ |/ / / / / | | _ / / | | / / Change-Id: I9c435126c80016cf3476c09d46633038ddf46250
| * | | BLACKLIST Tests_Picture::test_source for msvc-2019Heikki Halmet2019-07-311-0/+2
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-75276 Change-Id: Ief49097b9ff5b26a93afdcdc6357975d87f3363f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-163-0/+3
|\ \ \
View Lorry Controller Status