summaryrefslogtreecommitdiff
path: root/src/controls
Commit message (Collapse)AuthorAgeFilesLines
* Increase QtQuick import from 2.2 to 2.6 for QML LabelJussi Witick2017-06-161-1/+1
| | | | | | | | | Increase QtQuick import version to 2.6 to enable the properties of underlying QML Text type to be usable in the QML Label type too. Task-number: QTBUG-57895 Change-Id: I7a2b641a56c90ab91b4e6c973278d8943fa6903a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Support for Q_OS_ANDROID_EMBEDDED and android-embedded buildsOtto Ryynänen2017-06-011-2/+2
| | | | | | | | | | | The Embedded Android build (Boot to Qt Android injection) is defined by having both Q_OS_ANDROID and Q_OS_ANDROID_EMBEDDED flags defined, as well as having Qt config android-embedded. This commit enables the possibility to build embedded Android builds. (i.e. Qt build for Android baselayer only, without JNI) Change-Id: Ic825e034f8d4b39c45e03b9f0a965f126559991e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Update plugins.qmltypesMitch Curtis2017-05-291-116/+165
| | | | | Change-Id: I90f9118e7e9a9b5ffcc9cba8909ff2cf3dd1e166 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* SpinBox: set "editable" accessible propertyJ-P Nurmi2017-05-221-0/+1
| | | | | | | | | Because we want to make QQuickItemPrivate::canAcceptTabFocus() respect non-editable SpinBoxes (available in QQC2). Change-Id: If2bc2707c448203a2105ddc4de10ac1566818e00 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
* Slider: Don't suppress updates by dragThreshold on non-touchscreensUlf Hermann2017-05-101-1/+1
| | | | | | | | | | | | When using a mouse, you want a slider to react immediately to input, not only if you move beyond a certain threshold. With the threshold it is very hard to accurately position the slider. On touchscreens, the threshold is necessary to allow for unrelated events, like flicking views, to not interfere with the value. Change-Id: I6cb8252338f20de559e062e738118593ffc1e099 Task-number: QTBUG-47081 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Fix non-prefix builds on WindowsSimon Hausmann2017-04-261-2/+2
| | | | | | | | | | After commit 3ba11cf93820610273e2a16b13ab1d8c57a41d36 the shaders do not belong into QML_FILES anymore (and also don't need to be copied via COPIES consequently). Task-number: QTBUG-60214 Change-Id: I8d68fe76810c2d2d8945ef410a377aa2ce0068c1 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
* Fix packaging of shaders when qmlcache is usedJoni Poikelin2017-04-241-23/+7
| | | | | | | Task-number: QTBUG-60320 Change-Id: Iac74b469e971d28218fd35eadefb3c3b4bca4e51 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-04-184-7/+39
|\ | | | | | | Change-Id: Ife389a8fd4df1eef4f521ff734d02748b25ec184
| * 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>
* | Enable the use of QML caching at build timev5.9.0-beta2Simon Hausmann2017-04-111-3/+7
| | | | | | | | | | | | | | Task-number: QTBUG-58571 Change-Id: I11c9dfb4e0fad93b2961db4213f934eca7d214df Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Remove spurious Q_INIT_RESOURCE callsSimon Hausmann2017-04-031-2/+0
| | | | | | | | | | | | | | | | | | These explicit resource initialization calls are only needed when linking statically. Change-Id: I5518e1b32d4fc7c1d03d35dd15bf3ce65d5eafcf Reviewed-by: Andy Shaw <andy.shaw@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix warnings for -no-feature-itemviewsv5.9.0-beta1Nikita Krupenko2017-03-291-0/+2
| | | | | | | | | | | | Change-Id: I4dcca848212d6aed403bbed1a8b484ab269b3e47 Reviewed-by: Stephan Binner <stephan.binner@basyskom.com> Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
* | Fix build with -no-feature-libraryPaul Olav Tvete2017-03-201-0/+2
| | | | | | | | | | Change-Id: I310e90ec92b81939df11accb4cb6b1bd25df472e Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Take enabled property into account when styling MenuBar itemTuomas Vaarala2017-03-111-2/+2
| | | | | | | | | | | | | | | | | | | | When the MenuBar item's property enabled is set as false: - Gray out the MenuBar item text. - Disable the blue highlighting of item when selected. Task-number: QTBUG-59335 Change-Id: I2fb0eb5539bdeaf487f0fc5d499ace72e6c916b7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into 5.9Liang Qi2017-03-101-0/+2
|\ \ | |/ | | | | Change-Id: Iaceb3ddf7d7314d43309a60967e93132954b230a
| * 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>
* | Build fix for -no-feature-libraryPaul Olav Tvete2017-03-031-2/+3
| | | | | | | | | | Change-Id: I9339b134c8025e9f3e44933121e339a3107ad975 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Build fix for -no-feature-validatorPaul Olav Tvete2017-03-033-0/+9
| | | | | | | | | | Change-Id: Ib5c89c0934d5dbf2fe31c9ced09998c8a7405801 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Build fix for -no-feature-shortcutPaul Olav Tvete2017-03-032-0/+14
| | | | | | | | | | Change-Id: I63f1990f72d0eb736c5e1ecba5574bb13f9ef127 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Build fix for various widget featuresPaul Olav Tvete2017-03-031-4/+34
| | | | | | | | | | | | | | | | Make QtQuickControls build with -no-feature-spinbox, textedit, toolbar, itemviews, wheelevent, tabbar, tabwidget and slider. Change-Id: I780df0f624e885be03307908d4133d4ab91f8bea Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Merge remote-tracking branch 'qt/5.8' into 5.9Paul Olav Tvete2017-03-021-1/+4
|\ \ | |/ | | | | Change-Id: Ia4337204f3b69d63eb50d1b918685b098c77b48d
| * 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>
* | "to the empty string" => "to an empty string"Mitch Curtis2017-03-013-10/+10
| | | | | | | | | | | | Change-Id: I62f1fae431ce02c196c6ca582e0d033dbf38d836 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Note that iconName requires QApplicationMitch Curtis2017-03-014-0/+9
| | | | | | | | | | | | Task-number: QTBUG-37083 Change-Id: I3091776f4b4643136e67c9521efddb5462657d06 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix build for -no-feature-tooltipStephan Binner2017-02-281-3/+3
| | | | | | | | | | Change-Id: If4e71985a71d20dca7c49652a5b8957ab26c901f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devv5.9.0-alpha1Liang Qi2017-01-252-3/+2
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I64e4c4f9ca56b263d8f00d3ba6a1067d78f26065
| * 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>
| * [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>
* | Remove support for WinRT 8.1 and Windows Phone 8.1Maurice Kalinowski2017-01-1925-1023/+0
| | | | | | | | | | | | Task-number: QTBUG-57288 Change-Id: Ic57422aab1232e4309a1a4e6d2101f46e7e7ee32 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.8' into devLiang Qi2016-11-283-5/+7
|\ \ | |/ | | | | Change-Id: I753e8b4d10714f2b8c3cf0fccfed4dc312adbd9b
| * Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-261-2/+2
| |\ | | | | | | | | | Change-Id: I70641d4226d3851277e5d134bdbc68615b33de6a
| | * Merge remote-tracking branch 'origin/5.6' into 5.75.7Liang Qi2016-11-241-2/+2
| | |\ | | | | | | | | | | | | 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>
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-11-152-3/+5
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I67ccb5a6763045a0728d04e804f8a47c37b425f5
| | * | Merge remote-tracking branch 'origin/5.6' into 5.75.7.1Liang Qi2016-11-122-3/+5
| | |\ \ | | | |/ | | | | | | | | Change-Id: Idef60aa2d7b55600cca618f0f622e8e18e77f3de
| | | * 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>
| | | * 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.8' into devLiang Qi2016-09-2118-23/+138
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: I20f0f7a50b55907f4a6e574bdfe92bc9538879d6
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8Liang Qi2016-09-198-10/+51
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Conflicts: src/controls/controls.pro Change-Id: I0150ca08d83f292a5c8587ec886e206124757df4
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-09-187-10/+49
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | * Slider: fix the handle's position when minimumValue is not 0Mitch Curtis2016-09-141-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | __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>
| | | * RangeModel: Emit min/max and value changes after component is completeJoni Poikelin2016-08-303-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Merge remote-tracking branch 'origin/5.7' into 5.8v5.8.0-alpha1Liang Qi2016-08-3010-13/+87
| |\ \ \ | | |/ / | | | | | | | | Change-Id: I4f85412071d34b44f76870753e171e0beae2e7b9
| | * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-2710-13/+87
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Conflicts: tests/auto/qquicktreemodeladaptor/tst_qquicktreemodeladaptor.cpp Change-Id: I0b6018fdac65a5385136e4c3561fba1c52ecd32e
| | | * Fix moving of TreeView itemsJoni Poikelin2016-08-263-7/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
View Lorry Controller Status