summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Bump version5.6Oswald Buddenhagen2017-09-211-1/+1
| | | | Change-Id: I002b42f729ee0bbb7041bd2b0a1b94e5631e90d4
* Add change file for Qt 5.6.3v5.6.35.6.3Jani Heikkinen2017-09-061-0/+24
| | | | | | | | Task-number: QTBUG-62702 Change-Id: I023e298c7fc6a64153f374c718d5fce4af98fa78 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Liang Qi <liang.qi@qt.io> (cherry picked from commit 843f1add60219171eb7deb6e9724f100284aab06)
* Add benchmark to measure start-up time of complex QML applicationErik Verbruggen2017-06-024-0/+115
| | | | | | | | | This is not an automated benchmark, it is meant to be run manually or by a script. Change-Id: I72a4c15120ff4a650fb4bd2f90c6db1907dba994 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> (cherry picked from commit 97a0a64bf90687be72369532494e485caec10815)
* Mark both benchmarks as such in the pro filesErik Verbruggen2017-05-162-1/+2
| | | | | | | | | This enables them to be run with "make benchmark" Change-Id: I13ecd96087dd6586a47fb2abab269982f04803db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> (cherry picked from commit 74aa26528d4f56e4891d4d92eef7da8425242a5a)
* Bump versionOswald Buddenhagen2016-11-281-1/+1
| | | | Change-Id: If20b4d8a3280afd169991d479d7cfe330ba41288
* Fixed possible crash due to out of memory on ARMFilippo Cucchetto2016-11-231-2/+2
| | | | | | | | | | | | | | When diving two real values we can obtain an Infinite value. The qml engine perform an implicit conversion (and silent) if this value is directly assigned to an "int" property. On Arm the conversion of Infinite to int gives the value +2147483648. Thus the Repeater model instantiate 2147483648 items and crashes. By morphing both the rowHeight and paddedRowCount properties to "real" we keep the Infinite value semantic. This allows the Repeater to handle properly the Infinite case. Task-number: QTBUG-57283 Change-Id: I376f9ca497bea1f1aab413d1c1ba87d918b73fbb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* DefaultFileDialog: check cur selection properly on okButton clickedShawn Rutledge2016-11-171-2/+2
| | | | | | | | TableView has currentRow not currentIndex. Task-number: QTBUG-56663 Change-Id: I9376354364bc843d118a672fcd1d9dfbba8e775c Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* remove dependencies from sync.profileOswald Buddenhagen2016-11-111-13/+0
| | | | | | | the CI obtains them from the qt5 super repo nowadays. Change-Id: Iaf03da27ec5ab4e901672439801be1929676533a Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
* test: stablize extras::Tests_PieMenuLiang Qi2016-11-111-0/+26
| | | | | | Task-number: QTBUG-53520 Change-Id: I0a38467a873bac8104b2e1fba7f7018f236673e6 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Calendar: fix date selection if system time zone is set to DSTOleg Yadrov2016-11-011-1/+3
| | | | | | | | | | | | | | Date() constructor uses local time. E.g. in Brazil Oct-21-2012 is the start of daylight saving time, thus local dates at Oct-21-2012 between 00:00 and 01:00 do not exist there, so new Date(2012,10,21) returns Oct-20-2012 23:00, but new Date(2012,10,21,1) returns Oct-21-2012 00:00. 1 hour is enough to "jump over" the lost hour, but just in case we use 12. Task-number: QTBUG-54559 Change-Id: I35e1b69868d27dd98f78c4d57b3128a51b3e4b5e Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Make FileDialog remember the folderJ-P Nurmi2016-10-073-3/+18
| | | | | | Task-number: QTBUG-54310 Change-Id: I9beef4d983c5fcea4e969cae5090686dfc1d37c6 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* qtquickcontrols-tableview.qdoc: unify wording of documentationFrederik Schwarzer2016-10-061-2/+2
| | | | | | | This way it fits better to the other entries. Change-Id: I099ceaec4ecf80d267cb431815d63597e004fef1 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Merge remote-tracking branch 'origin/5.6.2' into 5.6Liang Qi2016-09-165-0/+152
|\ | | | | | | Change-Id: I216e0df7ffff798827f4bea2c5cb8769eb37a053
| * Fix crash on exit when using default property aliases with layoutsv5.6.25.6.2Mitch Curtis2016-09-134-0/+122
| | | | | | | | | | | | | | | | | | | | | | | | The layout was being destroyed before the text, which meant that the removeItemChangeListener() call never got hit. To ensure that the listener is always removed, loop through each child in QQuickLayout's destructor. Task-number: QTBUG-51927 Change-Id: I4235579501bd1790e9483a8741915e55f1b1b803 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Add changes file for 5.6.2Iikka Eklund2016-09-081-0/+30
| | | | | | | | | | Change-Id: I7676b06dfe58898b655e575208277f6a9a9ab7cf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Slider: fix the handle's position when minimumValue is not 0Mitch Curtis2016-09-142-4/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __handlePos (badly named; it should be, e.g. __handleValueForPos) represents the value of the handle based on "fakeHandle"'s position. It is the result of range.valueForPosition() being called. However, the arguments to this function (fakeHandle.x and fakeHandle.y) don't always change when the values of the slider change, which leads to the x calculation for the handle delegate in SliderStyle having outdated information, causing the related bug. The fix for another bug already works around this issue by passing the relevant properties as arguments (which are ignored) to the function call. This is presumably done this way because it should be cheaper than forcing the JavaScript engine to evaluate a more clearly written expression where each related property is on its own line, for example. property real __handlePos: { range.positionAtMinimum, range.positionAtMaximum; return range.valueForPosition(__horizontal ? fakeHandle.x : fakeHandle.y); } In the case of the related bug, minimumValue has been updated, but __handlePos is still using the old value, causing the handle to be positioned incorrectly. So, we continue this tradition and add another property to the list of arguments. Task-number: QTBUG-51765 Change-Id: I40882872e668a867a8f5e5768244e199618bd769 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add missing period to TableViewColumn documentationMitch Curtis2016-09-121-1/+1
| | | | | | | | | | Change-Id: I625e7d3e4b5003105587769edb8fc68747ceac35 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | CheckBox: fix missing indicator frame on certain DPIsMitch Curtis2016-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | Specifying width and height is typically a bad idea, as they can be overridden by the layouting engine. implicitWidth and implicitHeight are better. Change-Id: Ib597f1fa98f82f00236c79bb5f9f07405593c35e Task-number: QTBUG-51842 Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | SplitView: clarify how item sizes should be setMitch Curtis2016-09-051-1/+5
| | | | | | | | | | | | | | It's not exactly clear from the documentation. Change-Id: If173c63e080709c13b4a7b0bf18ef9b02eeec474 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* | Attempt to stabilize tst_scrollviewJ-P Nurmi2016-09-051-1/+1
|/ | | | | | Task-number: QTBUG-55727 Change-Id: I6cbc1f020ead184fd8475f965f69db635ee2cc7b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* RangeModel: Emit min/max and value changes after component is completeJoni Poikelin2016-08-305-6/+103
| | | | | | | | Prevent extra value changed signal to be fired in case when Slider with minimum > 0 and value > minimum are set. Change-Id: I86824c403a7c0296f782d2eec7ed30acfc13b304 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Fix moving of TreeView itemsJoni Poikelin2016-08-265-8/+103
| | | | | | | | | | | | | | | Property binding for row property in styleData causes an update which tries to read new value for the index property, but index is changed afterwards which causes old value to be read. This may lead to crashes and other unwanted behavior. Depth changes are now delivered to update item depths in visible items and model index changes though role instead of looking for a row change. Task-number: QTBUG-47523 Change-Id: I540cd06a25281f18e4628f4b030cf969dc8e0a7f Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
* macOS: Fix native dangling menu still visible on screen and crashFilipe Azevedo2016-08-222-0/+19
| | | | | | | | | | | | If the parent window gets destroyed while a QtQuick Controls menu is open the macOS native platform menu is not dismissed and you see a blank gray rectangle without any text. Also, at this point the QQmlEngine was already destroyed but it's still present on the call stack, so you get a crash when the stack unwinds to the original right mouse click that created the context menu. Change-Id: I638b0de13734815995d2994e6dd6603bcb0ebefc Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* Fix typo (word repetition) in documentationFrederik Schwarzer2016-08-181-1/+1
| | | | | Change-Id: I6242fa1ab805d13753678feb5929da67ae0f4385 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix typo in documentationFrederik Schwarzer2016-08-181-2/+2
| | | | | Change-Id: Ibd33614206e8d770bd7ee0888a8806662e3a1a73 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update scroll indicator position on content size changeNikita Krupenko2016-08-184-0/+126
| | | | | | | | | | | | | If scroll indicator is at the beginning and data prepended to contentItem, scroll indicator should change position to previous content beginning. This is especially important with so-called "infinite scrolling", when scrolling goes upwards and new content added at the top of the view. Task-number: QTBUG-50795 Change-Id: I250d6535b1146a54c6a70062b659cc49ed43709f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Change instances of 'OS X' to 'macOS'Topi Reinio2016-08-152-2/+2
| | | | | | | | | | As of version 10.12 (Sierra), the name of Apple's desktop operating system will be macOS. Change all occurrences where the platform is discussed to use the macro \macos (defined in the documentation configuration in qtbase). Change-Id: I5ca47e4d830c12df297ee298ed22fd2d41dee739 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io>
* Don't activate transient parent if it was closed meanwhileSergio Martins2016-08-121-1/+2
| | | | | | | | | | | | Closing a window while a popup is open should not trigger an activation event when the popup is closed. Prevents QGuiApplicationPrivate::focus_window from being changed to a stale window, which happens inside QGuiApplicationPrivate::processActivatedEvent(). Change-Id: I3145b3d191abb20d56fa9acbec8a0776a6bf8526 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* texteditor example: check if document is null before using itMitch Curtis2016-08-021-0/+6
| | | | | | | | | | | | | This hasn't been an issue so far probably because those properties were accessed after m_doc had been set. However, adding some debug text can trigger a crash: Text { text: "document.cursorPosition=" + document.cursorPosition } Change-Id: Ib468815cdc0b103a2384457ab937cc3b764b96c8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix incorrect usage of tryCompare in Tests_Calendar::asynchronousMitch Curtis2016-07-071-2/+5
| | | | | | Change-Id: I1c4c467eb549ea0be40cb1706647f933a963ada5 Task-number: QTBUG-54558 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* fix tooltip usageTim Jenssen2016-06-201-1/+1
| | | | | Change-Id: I305659b22f680eea903bf2e02a2998b9f71f5f5f Reviewed-by: Tim Jenssen <tim.jenssen@theqtcompany.com>
* Expand license scope from "Qt GUI Toolkit" to "Qt Toolkit"Sze Howe Koh2016-06-193-3/+3
| | | | | | | See http://comments.gmane.org/gmane.comp.lib.qt.devel/25771 Change-Id: If103e86d52428c4c6ea7ed9c4c6dd50ece6e8461 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* Doc: Fix documentation warningsTopi Reinio2016-06-174-9/+10
| | | | | | | | | | | src/controls/doc/src/qtquickcontrols-examples.qdoc:90: warning: Unable to parse QML snippet: "Expected token `{'" at line 1, column 10 src/controls/doc/src/qtquickcontrols-examples.qdoc:116: warning: Unable to parse QML snippet: "Expected a qualified name id" at line 1, column 1 src/controls/doc/src/qtquickcontrols-tableview.qdoc:299: warning: Unrecognizable QML module/component qualifier for TableView::section src/controls/doc/src/qtquickcontrols-treeview.qdoc:138: warning: Unrecognizable QML module/component qualifier for TreeView::section (multiple) warning: Can't link to 'DropShadow' Change-Id: Ic5e2dcbe9810486290e164f561ecba969f57df78 Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
* Merge "Merge remote-tracking branch 'origin/5.6.1' into 5.6" into ↵Liang Qi2016-06-091-0/+30
|\ | | | | | | refs/staging/5.6
| * Merge remote-tracking branch 'origin/5.6.1' into 5.6Liang Qi2016-06-091-0/+30
| |\ | | | | | | | | | Change-Id: I9d0eb301403bb785ab40120463c0ad184d1af7be
| | * Add changelog for 5.6.1v5.6.1-1v5.6.15.6.1Venugopal Shivashankar2016-05-241-0/+30
| | | | | | | | | | | | | | | | | | Change-Id: I45816d2984bc91d2eb72d8d1c7506f9012486976 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | ScrollView: block updates when redoing the layoutOlivier Goffart2016-06-091-0/+2
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | Changing the contentHeight might change the maximum value of the scrollbar which might change the value of the scrollbar which, if blockUpdates is not set, will change the contentY of the flickable. This can cause flickering when contentHeight varries with contentY which might typically happen for a ListView where not all elements have the same height. Or worse, this can make the scrolling jump and result in the wrong position. Change-Id: I1968055492d679387ebbf6813a160efbf82e4fbb Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | Bump versionOswald Buddenhagen2016-05-191-1/+1
|/ | | | Change-Id: I8c4251a7b49cbb572b64490f41edf87830603ecc
* Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-123-3/+3
| | | | | | | | Examples in binary packages now directly match the install path. Change-Id: Icd9ae9ef887b99b96177ec7b590fc3f35da18c82 Task-number: QTBUG-52953 Reviewed-by: Antti Kokko <antti.kokko@qt.io>
* Delete the m_styleoption properlyAlbert Astals Cid2016-05-111-1/+33
| | | | | | | | Unfortunately the destructor of QStyleOption is not virtual so you need to cast them all individually otherwise the wrong destructor is called Change-Id: I3b07450438d98910fbbff9f81234876551ed4e5d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Save some time and memory by using the SystemPalette singletonAleix Pol2016-05-111-5/+1
| | | | | | | | | Instead of instantiating a SystemPalette object for every Label, re-use the singleton, which is already designed for this. Change-Id: I7356fc983ea6dcd4dad0207c41ae1e0ba07dace4 Reviewed-by: Albert Astals Cid <albert.astals@canonical.com> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Dialogs: enforce changes in minimum sizeShawn Rutledge2016-05-101-4/+9
| | | | | | | | | | | | | On OS X, if visible: true is declared, the dialog can be shown before the changes in 10f0ae7c571b7e0de41d5fdc5627db6a1ddeb926 are able to set the minimumWidth/Height properties. QWindow::setMinimumWidth() also does not force the window to be wider if it is already shown. Task-number: QTBUG-49058 Change-Id: Id87d92072904555639e1695851d908550d22fe86 Reviewed-by: Alberto Mardegan <mardy@users.sourceforge.net> Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Liang Qi <liang.qi@qt.io>
* Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-069-9/+9
| | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
* tst_extras: skip crashy test_resize() on WindowsJ-P Nurmi2016-05-031-3/+5
| | | | | | | Task-number: QTBUG-53123 Change-Id: If7b33d46828808d869a7e325a908a8a353c35f57 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* QQuickControlSettings (Android): check touch devicesAnton Kudryavtsev2016-05-031-5/+0
| | | | | | | | | | | | | It's needed for Android devices that have not touch screen, e.g STB. QTBUG-36007 is already resolved and we can use QTouchDevice::devices() Task-number: QTBUG-36007 Task-number: QTBUG-53095 Change-Id: Iaab89cc75238d1aba83ce3d79f3c29fb5cab172f Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* tst_extras: skip crashing test_resize(PieMenu)J-P Nurmi2016-05-021-4/+8
| | | | | | | | | | | | This has been consistently blocking the qt5 integration, and nobody is able to reproduce the crash locally or when running tests manually in the CI. We don't even know where exactly it crashes, but this change skips the test that we assume to be problematic. Change-Id: Ia5665a542890b90a296d5d068c14e78fc9c3c625 Task-nubmer: QTBUG-53123 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Static builds: ensure we link against layoutsRichard Moe Gustavsen2016-04-301-0/+1
| | | | | | | | | | ApplicationWindow.qml makes use of QtQuick.Layouts. For that reason we need to inform qmake about the dependency so that it links it in for static builds. Change-Id: I30022a3329bc4adca5ca856bc37e72bb157894cd Task-number: QTBUG-52652 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* tst_extras: change QML TestCase visibility bindingsJ-P Nurmi2016-04-298-8/+8
| | | | | | | | | | Let QML TestCase be implicitly shown together with the internal test window. The visibility binding to windowShown is unnecessary, and might cause extra visibility state changes, which in turn may cause other issues further down the chain. Change-Id: I59654c4035185ddcbc1e2c4c231f9a6d76d12383 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* make use of COPIESOswald Buddenhagen2016-04-281-6/+3
| | | | | Change-Id: I232cf933b20e53ea7403a993edfe00c5eda5a0b1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* fix example installsOswald Buddenhagen2016-04-28199-11/+52
| | | | | | | this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
View Lorry Controller Status