summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* 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>
* 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
* | 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>
* 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.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>
* 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>
* Bump versionKari Oikarinen2019-03-211-1/+1
| | | | Change-Id: I3d2d235fc7df5e437642213e4011b9162bf55af9
* 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>
* | 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
| * Add changes file for Qt 5.12.1v5.12.15.12.1Antti Kokko2019-01-101-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + 0489c0a88a293696592c5892383698a015ae68c7 Improve startup benchmark + 602f1225938f9338c3ee799c64d5449ebc12b8bc Refine startup benchmark termination condition + cf957e407030fc260bd86882cf2f79724126abdd Bump version + 10b3bffbd21b6265a3d124f310c99fcbac2b027f TableView: Handle dynamic insertion of TableViewColumns correctly + 6b7f91c097f7e47cf2683d08b5838fd061a872bd Add changes file for Qt 5.11.3 + 50b6fb27458708a18f4114e3ebec0fa632b2659f Unskip test of fixed bug + 80ba7e03afe18cc44715f7cf9a038bedff01f328 QQuickTreeModelAdaptor1: fix out of range issue in selectionForRowRange + 8abf15b4ba974576e13f37b09117454fc1e6b1d9 Static: Install the qmldir for the Styles module + a9436b597916d5619cbbbbd103bc482ddaf4359a Static: Register the base style qml files so they can be found + 69c7e95da101d4d66d25c4850f3591d4ccd2bbc1 Insert before next item when it exists + bd952e904070d8eb07748d620829e9dadb8022ba Bump version Change-Id: I26d4c9fd88ddc3c17cad7a0b75b63b3527da03b0 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix progress indicator with vertical progress barJoni Poikelin2019-01-281-2/+1
| | | | | | | | | | | | Fixes: QTBUG-65209 Change-Id: I1cdd2809e4bc3f2d37421fa785c84b1fa0b9d12e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Fix incorrect transientScrollBars binding in BasicTableViewShawn Rutledge2019-01-281-2/+2
| | | | | | | | | | | | Fixes: QTBUG-69041 Change-Id: I7ad62850c8890d7ec53678754a164ad2bcfbdb8e Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Calendar: Ignore any time specified for a minimum and maximum dateAndy Shaw2019-01-144-58/+73
| | | | | | | | | | | | | | | | | | | | | | | | Since Calendar only cares about the date part and not the time, we should ignore the time part when it is set as the minimum and maximum and manually set it to 0:00:00 and 23:59:59 respectively. This ensures that the day itself is still seen as valid irrespective of what time was passed to Date(). Change-Id: I57c311ffe7d3fb1ab69c59296a067a66f1007137 Fixes: QTBUG-71997 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
* | Bump versionKari Oikarinen2019-01-141-1/+1
|/ | | | Change-Id: I0d0cc5ddf7f15e821e4b47af516289cd19e62362
* Bump versionKari Oikarinen2019-01-071-1/+1
| | | | Change-Id: I04bcfbe22fe4da558ca4f003964d4ae60ff70bc9
* Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-12-111-0/+20
|\ | | | | | | Change-Id: I0f1262774dcbc5e8abd638da9a7411aa9300d53a
| * Merge remote-tracking branch 'origin/5.11.3' into 5.11Qt Forward Merge Bot2018-12-041-0/+20
| |\ | | | | | | | | | Change-Id: Ieb05ddae6d0675c8ad97e3851e231d8457a1c4e8
| | * Add changes file for Qt 5.11.3v5.11.35.11.3Antti Kokko2018-11-191-0/+20
| |/ | | | | | | | | | | | | | | + d76117604a9e04a9a66c0279687cc7dc54b9dc68 Doc: Add missing documentation for styleData.role in itemDelegate + cf957e407030fc260bd86882cf2f79724126abdd Bump version Change-Id: I26561264674a30970335d571acd0d8b61f3d8382 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Insert before next item when it existsAllan Sandfeld Jensen2018-12-101-2/+9
| | | | | | | | | | | | | | | | | | | | | | Something is off about the way the last child of previous item is calculated, but we can work-around that by just using the next element when it exist. In the case there isn't a next element, we will hit the fallback in 'last child of previous' and insert at the end anyway. Fixes: QTBUG-66062 Change-Id: Iced69d52c4587434ffdbb09b08b3441289f34eba Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | Static: Register the base style qml files so they can be foundAndy Shaw2018-12-103-2/+49
| | | | | | | | | | | | | | | | | | | | | | If the files are not registered then it will look for them on the disk instead because it has no entry for them. This changed at some point in the Qt 5.12.0 release but has technically been wrong for some time as they should always be registered. Change-Id: I8246a4f5fb4d94ebc5f7ca262d1821a409eb6c9f Fixes: QTBUG-72338 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Static: Install the qmldir for the Styles moduleAndy Shaw2018-12-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Mention qmldir in AUX_QML_FILES to ensure that it is always copied to the build directory. qml_module.prf usually takes care of this by having QML_FILES in qmldir.files with INSTALLS += qmldir, but with CONFIG += builtin_resources (set for static) that's not the case. AUX_QML_FILES is the correct variable though. Task-number: QTBUG-67644 Change-Id: I6cf580586dec0bf7b44c89b95134d7d7f683102e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge "Merge remote-tracking branch 'origin/5.12.0' into 5.12" into ↵Qt Forward Merge Bot2018-12-053-2/+29
|\ \ | | | | | | | | | refs/staging/5.12
| * \ Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-053-2/+29
| |\ \ | | | | | | | | | | | | Change-Id: I253bdcb4f9847a73165196599341dab03e291fc1
| | * | Fix button menus not opening on the second attemptv5.12.0-rc2v5.12.05.12.0Mitch Curtis2018-11-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Assign a parent to the QQmlComponent returned by QQuickControlSettings1::styleComponent() so that it doesn't get garbage collected by the QML engine. This was not an issue until 5.12, but it seems like a good idea regardless. Change-Id: I53265b23afab62e2276fe6e10d976a93a4f12e6f Fixes: QTBUG-71238 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
| | * | Doc: Ignore WinRT-specific qml files from the documentation buildv5.12.0-rc1Topi Reinio2018-11-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These files contain no documentation and cause conflicts with documentation sources that actually try to document them. Task-number: QTBUG-71174 Change-Id: I7382a1e05bed2070c45a4234cc3389a02922cdbf Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| | * | Add changes file for Qt 5.12.0v5.12.0-beta4Antti Kokko2018-10-311-0/+25
| | | | | | | | | | | | | | | | | | | | Change-Id: Ia703f49cf0218087a7b51a63d1a86423573ed62d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | | QQuickTreeModelAdaptor1: fix out of range issue in selectionForRowRangeSamuel Gaist2018-12-051-0/+2
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the index of the "to" row is invalid and the one from the "from" row is good, then the method will try to access an invalid index. This patch fixes that by ensuring that if the "to" row is invalid (when, for example, the mouse cursor goes out of the view while multiple selection is activated), the "to" index used stays valid. [ChangeLog][Controls][QQuickTreeModelAdaptor1] Fixed an issue where an invalid access was done if either extended or multiple selection was in use and the mouse went out of the view on top of the model. Fixes: QTBUG-71789 Change-Id: I32d8a20ee9ffc1c40584f17c27ceb06d48b81ff0 Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* | | Unskip test of fixed bugAllan Sandfeld Jensen2018-11-291-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Was never unskipped after being fixed Task-number: QTBUG-47523 Change-Id: Ibb193b45a73ca627ab3db7db8d1bf7b98f9ee8b4 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* | | Merge "Merge remote-tracking branch 'origin/5.11' into 5.12" into ↵Liang Qi2018-11-160-0/+0
|\ \ \ | | | | | | | | | | | | refs/staging/5.12
| * \ \ Merge remote-tracking branch 'origin/5.11' into 5.12Qt Forward Merge Bot2018-11-160-0/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Icfa31ff7f17842b66eac89863e016b1a96eccc36
| | * | Bump versionOswald Buddenhagen2018-11-081-1/+1
| | | | | | | | | | | | | | | | Change-Id: I0947415f129a3076d8d69b8f47cb0e55968291bc
* | | | TableView: Handle dynamic insertion of TableViewColumns correctlyAndy Shaw2018-11-163-0/+101
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | When inserting a TableViewColumn after the TableView is created, then it needs to be inserted into the list of columns at the specified index so that it responds correctly to things like resizeColumnsToContents() Fixes: QTBUG-58594 Change-Id: If7ff545306fe8b6616d8e016eb87e565ed40c836 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* | | Refine startup benchmark termination conditionSimon Hausmann2018-10-313-12/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of using a timer to terminate the benchmark, let's terminate the benchmark after we've sent off the first rendered frame. This is a bit more realistic, although it doesn't change numbers on my machine. Change-Id: I9a3724ecf781191d2b4dd937a5b74960a19550df Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | | Improve startup benchmarkSimon Hausmann2018-10-311-15/+15
| |/ |/| | | | | | | | | | | | | | | Don't measure the time it takes to destruct the QQmlEngine, as that may be heavy work due to the last sweep of the garbage collector heap and deleting all engine-owned QObjects. Change-Id: Ibdd3d92e306d0418ee7080077b8894950878ec43 Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
* | Doc: Document Qt Quick Controls explicitly as 'version 1'Venugopal Shivashankar2018-10-2615-128/+131
| | | | | | | | | | | | | | | | | | This is to explicitly identify Qt Quick Controls as Controls 1, so that Controls 2 can be referred generally as Qt Quick Controls. Task-number: QTBUG-70333 Change-Id: I798c0354ad47ab96978575829322a254876529fb Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* | Merge remote-tracking branch 'origin/5.11' into 5.12v5.12.0-beta3Qt Forward Merge Bot2018-10-131-0/+1
|\ \ | |/ | | | | Change-Id: I7986808ea6b61f4d500e678968e1ce706518636f
| * Doc: Add missing documentation for styleData.role in itemDelegateAndy Shaw2018-10-121-0/+1
| | | | | | | | | | Change-Id: Ie3f95fd97dae39bf9248898c97d0500feebf5014 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Fix build when filedialog feature is disabledv5.12.0-beta2v5.12.0-beta1Eskil Abrahamsen Blomfeldt2018-10-011-2/+4
| | | | | | | | | | | | | | | | When the filedialog feature is disabled, we cannot include the headers for it, so we move the include into the #if block instead. Change-Id: I7b3556b570b8e7bd4aaed0ed8b1a0f4195b78975 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
View Lorry Controller Status