summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-264-715/+714
|\ \ \ | |/ / | | | | | | Change-Id: Ib3ca61bf2e6506242f62f4add82f0162f0a0f123
| * | 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>
* | | Adapt to new Connections syntaxUlf Hermann2019-10-2027-75/+86
| | | | | | | | | | | | | | | | | | Change-Id: I299baf89f2530250a333736bb31f4ae470610176 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-192-35/+3
|\ \ \ | |/ / | | | | | | Change-Id: I4044a522b132a0045858311d5628409a3225f3d4
| * | 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>
* | | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-10-1228-71/+255
|\ \ \ | |/ / | | | | | | Change-Id: I65f0f976bbf1a93240b109517ef09a33c62b6fb4
| * | 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>
* | | Merge "Merge remote-tracking branch 'origin/5.14' into 5.15"Qt Forward Merge Bot2019-09-193-1/+42
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-193-1/+42
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I6eeb300362ec0769eae1e48f3409424f977e3774
| * | 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>
* | | | | Bump versionKari Oikarinen2019-08-271-1/+1
|/ / / / | | | | | | | | | | | | Change-Id: If49e4dfac95fd32b8168d9413965c6de14c190b6
* | | | 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
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-163-0/+3
| |\ \ \ |/ / / / | | _ / | | / Change-Id: I69f231e99be0cc9a5600d95d1f53f70f5d55593e
| * | Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"Qt Forward Merge Bot2019-07-110-0/+0
| |\ \
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-07-110-0/+0
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I212c99525128943f17361665d7d9149346f9ffee
| | | * Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ic894f3b21f7734067ba0d0375101179306580c55
| | | * Skip Tests_ScrollView::test_dragFetchAppendMitch Curtis2019-07-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's notoriously flaky, with several attempts to stabilise it so far, and it's now blocking 5.13. I would blacklist it, but QTBUG-74117. Task-number: QTBUG-55727 Change-Id: I653f534ed712fa5af9bcf6340faee2cae2f1c99b (cherry picked from commit 6b62b506d6eb06271e082dcedaf75fd588a5b17c) Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
| * | | Doc: Replace example file lists with links to code.qt.ioTopi Reinio2019-07-093-0/+3
| |/ / | | | | | | | | | | | | | | | Task-number: QTBUG-74391 Change-Id: If30143e106fec5a8694c47ab2376aeda36faf8e1 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | Eradicate Java-style iterators and Q_FOREACH and mark the module free of themMarc Mutz2019-07-156-28/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ... and QLinkedList. Java-style iterators are scheduled to be deprecated, or at the very least banned from use in Qt's own implementation. Ditto Q_FOREACH. Ditto QLinkedList. Change-Id: I92eb5c22762b63cba45f8eaf717c1b7d458fcda4 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.13' into dev"Qt Forward Merge Bot2019-07-110-0/+0
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/5.13' into devQt Forward Merge Bot2019-07-110-0/+0
| |\ \ \ |/ / / / | | _ / | | / | | | | | | | | | Conflicts: .qmake.conf Change-Id: I174399e902fbaaecc0dfd3e1842f72247fc8b901
| * | Bump versionFrederik Gladhorn2019-07-011-1/+1
| | | | | | | | | | | | Change-Id: I942b7eb034f160f96869cdaddf01fe9950a6b42e
* | | 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>
View Lorry Controller Status