summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* Add NOTIFY signals for WheelArea5.8Marco Martin2017-04-033-6/+38
| | | | | | | | | | | | | | | | the private WheelArea component didn't have any notify signals in its horizontalValue/verticalValue or minimum/maximum values as well. this caused old values to be used in ScrollView.qml. If we want to have a listView that starts scrolled right when instanced, verticalMaximumValue won't be updated when the list is populated. Also, the wheelArea.verticalValue that's assigned at the beginning will be constrained by the wrong verticalMaximumValue, causing it to go out of sync with contentY. At this point the first time the mouse wheel is moved, the list will jump back at the top. Change-Id: I4605000636be7975ba9a58e2c79e8c2351e5a292 Task-number: QTBUG-59633 Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Fix "Unable to assign Object to QString" warningJason Erb2017-03-111-1/+1
| | | | | | Change-Id: Ic219be7b90cbcde8fcc6a2e4d4a598a5d38b1d47 Task-number: QTBUG-47539 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Prevent wheel events from escaping SliderJason Erb2017-03-021-0/+2
| | | | | | Task-number: QTBUG-42273 Change-Id: I31e77cbb5a149ad160f806529140165baf48c8ac Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Made Button accept space key press and release eventsJason Erb2017-02-101-1/+4
| | | | | | Task-number: QTBUG-57853 Change-Id: I33cd09d78e470a85d0f816781e683b7574f673ab Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix feature dependenciesPaul Olav Tvete2017-02-063-19/+54
| | | | | | | | | Build with -no-feature-filedialog, -no-feature-messagebox, -no-feature-colordialog, and -no-feature-fontdialog Change-Id: I0d63451a546014400f051645460a1fc1362eb753 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Merge remote-tracking branch 'origin/5.8.0' into 5.8Liang Qi2017-01-261-0/+33
|\ | | | | | | Change-Id: I35027b94ab70362fc3932e3817c765f96c45e722
| * Add changes file for 5.8.0v5.8.0-rc1v5.8.05.8.0Jani Heikkinen2016-12-091-0/+33
| | | | | | | | | | | | Change-Id: I63a99f4816101317576164d5c2335ffd9c02a86a Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | ScrollViewStyle: Limit maximum scroll bar sizeKai Uwe Broulik2017-01-161-2/+2
| | | | | | | | | | | | | | | | | | Avoids the scroll bar overflowing its container. This can happen when e.g. contentWidth/height becomes zero. Change-Id: Ib01e65535ef1f11e32aaca8b19ec93f5ebf99736 Reviewed-by: Marco Martin <notmart@gmail.com> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Bump versionOswald Buddenhagen2017-01-031-1/+1
| | | | | | | | Change-Id: I0dcea5046d944c871a335356ea0ab9b97fbdbd55
* | [Desktop GroupBoxStyle] Don't hardcode textureHeightKai Uwe Broulik2017-01-021-1/+0
|/ | | | | | | This fixes skewed GroupBoxes in Plasma's config dialogs when using larger fonts. Change-Id: Ie850658da3f47d57eed0904c26dbbb26457a83e8 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-262-4/+4
|\ | | | | | | Change-Id: I70641d4226d3851277e5d134bdbc68615b33de6a
| * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-242-4/+4
| |\ | | | | | | | | | Change-Id: I4a76c586b2e5e49616627c306dd345bdeee64b62
| | * 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>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-158-20/+55
|\ \ \ | |/ / | | | | | | Change-Id: I67ccb5a6763045a0728d04e804f8a47c37b425f5
| * | Merge remote-tracking branch 'origin/5.6' into 5.75.7.1Liang Qi2016-11-127-19/+49
| |\ \ | | |/ | | | | | | Change-Id: Idef60aa2d7b55600cca618f0f622e8e18e77f3de
| | * 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>
| * | Make tst_customcontrolsstyle pass with custom QML2_IMPORT_PATHv5.7.1Dmitry Shachnev2016-10-041-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | The use case is testing the built package in Debian, when the files are built locally, but not yet installed on the system. Change-Id: Ibe06b33b2d6fb625d3bc65e9f54b6c1407c415c9 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Rename QQuickDialog to QQuickDialog1v5.8.0-beta1Jake Petroules2016-10-065-23/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a linking error when Qt is built statically and both Qt Quick Controls 1 and Qt Quick Controls 2 are used in the same application, due to Qt Quick Controls 2 also containing a class named QQuickDialog. Change-Id: I16ad8b1a3c75d0fa3e4ba1c3ab54a63caf05bbea Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Alex Leutgöb <alex@v-play.net> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-1916-13/+303
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: src/controls/controls.pro Change-Id: I0150ca08d83f292a5c8587ec886e206124757df4
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-1815-13/+301
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/Private/qquickrangemodel.cpp src/controls/Private/qquickrangemodel_p.h src/controls/Private/qquickrangemodel_p_p.h src/layouts/qquicklayout.cpp tests/auto/controls/data/tst_rangemodel.qml Change-Id: I9c8f6326c6edf9ebb18dd538f76830e1b439ba8e
| | * 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>
| * | Static builds: show QML files in QtCreatorRichard Moe Gustavsen2016-09-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After b4c1391, QML files does no longer show up in QtCreator for static builds. Before they would show as resources, but since we now only create resources explicit for dynamic builds (and implicit otherwise), QtCreator cannot see them. This patch will add all the qml files as OTHER_FILES when doing static builds, so they show up in QtCreator. Change-Id: I8ee7d53e938cd96da23b0dc0ca78406449e3504d Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Fix sqlite detectionLars Knoll2016-09-121-1/+1
| | | | | | | | | | | | | | | | | | | | | There is now a sql-sqlite feature in qtbase that should get used. Change-Id: I8abc60bec5c0fa64d180150c598f0a6605844473 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Remove test exclusion of Tests_CircularTickmarkLabel::test_tickmarksAndLabelsSimon Hausmann2016-08-311-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug is fixed now in declarative. Task-number: QTBUG-54394 Change-Id: I5fcc39125eca2bca3c597fc472b596dc317275e5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-alpha1Liang Qi2016-08-3025-33/+280
|\ \ \ | |/ / | | | | | | Change-Id: I4f85412071d34b44f76870753e171e0beae2e7b9
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-2716-14/+261
| |\ \ | | |/ | | | | | | | | | | | | | | | Conflicts: tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
| | * 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 ColorDialog.color and FontDialog.font update on acceptJ-P Nurmi2016-08-179-19/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using native dialogs, ColorDialog.color was not updated at all, and FontDialog.font was incorrectly following FontDialog.currentFont. Promote the overridden accept() methods to the abstract base classes so the native dialogs get the appropriate property updates on accept the same way compared to the non-native dialogs. Task-number: QTBUG-55298 Change-Id: I9ac8f5ecc60884cd98b58d09ef3dcb4baf47772d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Revert "Blacklisted Tests_PieMenu::test_triggerMode() in extra"Liang Qi2016-08-251-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The issue was fixed by 651ecf9ae413478af622761e89347bb4e6243e0c in qtdeclarative. This reverts commit 817d6971ebf75d0b276a93e1ee15d4826ba76c30. Task-number: QTBUG-55325 Change-Id: Ic9e730c65d613fcbb3c1b2a7ff86689c6f39ec12 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Blacklisted Tests_PieMenu::test_triggerMode() in extraLiang Qi2016-08-161-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Task-number: QTBUG-55325 Change-Id: Id21ae3ba9e4de8bb7a22507261f6effbc8ec95d8 Reviewed-by: Lars Knoll <lars.knoll@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
View Lorry Controller Status