summaryrefslogtreecommitdiff
path: root/src/controls
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | 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>
| | | * 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-181-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | TumblerStyle: deprecate spacing propertyMitch Curtis2016-09-021-0/+4
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Not only was this unused, but the idea doesn't make sense for Tumbler, which is internally based on PathView. Having gaps between delegates in a PathView means that there will be areas where the user cannot "flick" the Tumbler. The height of the tumbler can be increased and/or visibleItemCount can be decreased in order to achieve larger spacing between text. [ChangeLog][Styles][TumblerStyle] Deprecated unused spacing property. Task-number: QTBUG-55289 Change-Id: Ieadaac8678642d747820b201598745c7e099ead4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-0239-60/+58
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iab80dd0c2bea54171971fd7a9538000908ed90d5
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-014-8/+11
| |\ \ | | |/ | | | | | | Change-Id: I316bcbbc5308fda27728df15db1e780aa073da2a
| | * 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>
| | * 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>
| * | Doc: QQuickRangeModel --> QQuickRangeModel1Nico Vertriest2016-07-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | Error message: Cannot find 'QQuickRangeModel::minimumValue' specified with '\property' for several properties Change-Id: I82bf7a277da27b096e15aac223612b96fcddadc4 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Find custom styles from custom paths when set afterwardsDavid Faure2016-07-061-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the very frequent warning from plasmashell: WARNING: Cannot find style "Plasma" Change-Id: Ibe853e7b8b42adc2bce7c63a1505b27898ea5ffc Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Find custom styles stored in qrc.David Faure2016-07-062-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The unittest was showing that it was looking in <CURRENTDIR>/qrc:/qt-project.org/imports/QtQuick/Controls/Styles which makes no sense. In addition, the code was only listing the directory where the default style is found. When the custom style is elsewhere, it needs to be looked up in addition. Change-Id: I93eddab73672c575cd92037e1d0b366cf17540ef Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Doc: added qtgraphicaleffects to qdocconfNico Vertriest2016-07-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Corrected link issue with DropShadow in PieBoxStyle.qml Change-Id: I66821c69f392b016a0ea1a699a26990d7aad5140 Reviewed-by: J-P Nurmi <jpnurmi@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Doc: Add missing \qmlmodule and \inqmlmodule commandsTopi Reinio2016-06-223-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | These are not strictly necessary as they are for internal types, but it makes it easier for QDoc to resolve the type inheritance. Change-Id: If4a2650fab5251081ae74b109bfb97220c25751c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Revert "Fix Controls 1 types linking to Controls 2"Topi Reinio2016-06-2229-29/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7. The incorrect \inherits commands caused property documentation from base types go missing. Task-number: QTBUG-54150 Change-Id: I0bbe604a6fe904d8e6a4596777262255a794ec62 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Fix iOS style build on case-sensitive file systemsJ-P Nurmi2016-06-201-1/+1
| | | | | | | | | | | | | | | | | | | | | Change-Id: I3704fd913d26646d8ecdf2a81680d66e8960704c Task-number: QTBUG-54192 Reviewed-by: Jake Petroules <jake.petroules@qt.io> Reviewed-by: Andy Shaw <andy.shaw@qt.io>
* | | Fix build after qtdeclarative changeAllan Sandfeld Jensen2016-07-132-5/+5
| | | | | | | | | | | | | | | | | | | | | Also silences 'hides overloaded virtual function' warnings Change-Id: Id0bb6e01017fea78166a7cfacd921fd801dcb235 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* | | Make FastGlow multi backendLaszlo Agocs2016-07-0112-131/+243
| | | | | | | | | | | | | | | | | | Change-Id: I869fe798d6e4ee0e61b6f99065338b6127d664d7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | | Migrate to the new QSGNinePatchNodeLaszlo Agocs2016-06-221-122/+3
| | | | | | | | | | | | | | | | | | | | | | | | This makes the style node compatible with backends using graphics APIs other than OpenGL. Change-Id: I97f169d9f82fb83660f95891b0a7c94b5f8dbde9 Reviewed-by: Gunnar Sletta <gunnar@sletta.org>
* | | ComboBox: update selectedText when model is changedTuomas Heimonen2016-06-151-0/+1
|/ / | | | | | | | | | | | | | | | | When QML ComboBox's model is changed and currentIndex has not been changed, selectedText is now updated correctly. Task-number: QTBUG-53921 Change-Id: I778d196b3c69a29928bace9fd54b4118f0c78e9f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Fix Controls 1 types linking to Controls 2v5.7.0-rc1v5.7.05.7.0Mitch Curtis2016-05-2629-0/+29
| | | | | | | | | | | | Task-number: QTBUG-53529 Change-Id: I4933a03c49dee4e3edc56dd406f67073da341ac1 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-193-7/+35
|\ \ | |/ | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Ia45d6b4318ffe60c386c8548de7bb3f07c4cd6f9
| * Doc: Remove repository name from examplesinstallpathTopi Reinio2016-05-121-1/+1
| | | | | | | | | | | | | | | | 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>
* | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-05-107-15/+6
|\ \ | |/ | | | | | | | | | | | | Conflicts: examples/quickcontrols/extras/flat/main.cpp src/controls/Private/qquickcontrolsettings.cpp Change-Id: I9eb9342a2ee994611f3cb18daab6dd89eb924ccc
| * Cleanup QQmlExtensionInterface usageJ-P Nurmi2016-05-062-2/+2
| | | | | | | | | | | | | | | | Use the pre-defined macro. Change-Id: I52e362672ff719202d3e40e4245baac2af29f624 Task-number: QTBUG-53208 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
| * 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>
| * 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>
| * fix example installsOswald Buddenhagen2016-04-281-2/+2
| | | | | | | | | | | | | | this includes renaming the first-level subdir of examples/. Change-Id: Idf14164533c247e5c0cc5acdb405ac97f7c33ac5 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * Remove unused variableAleix Pol2016-04-201-1/+0
| | | | | | | | | | Change-Id: If6a3ebfdea652437522d3a22e0399818d887b3d5 Reviewed-by: Shawn Rutledge <shawn.rutledge@theqtcompany.com>
| * Improve DialStyle's valueToAngle() tests and documentationMitch Curtis2016-04-181-4/+0
| | | | | | | | | | | | | | | | The minimumValueAngle and maximumValueAngle variables it mentions are private. Change-Id: Ib95c96aeb218c8624857c212429f6c4e4e77ece2 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * qtquickcontrols.qdocconf: Fix path to qquickabstractstyle_p.h.Friedemann Kleint2016-04-181-1/+1
| | | | | | | | | | | | | | | | | | Fix qdoc-warning: qtquickcontrols/src/controls/doc/qtquickcontrols.qdocconf:50: warning: Cannot find file or directory: ../Private/qquickabstractstyle.h / Change-Id: If4548ebc2a33a42fd756f8a67d83e64c8dc8d638 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Remove the traces of the discontinued android-no-sdk platformEirik Aavitsland2016-04-291-2/+2
| | | | | | | | | | Change-Id: I63e4e2b807e7b222a589a5e03d510acfe1d97511 Reviewed-by: Andy Nichols <andy.nichols@qt.io>
* | TextArea: disable selectByMouse on iOSRichard Moe Gustavsen2016-04-261-1/+1
| | | | | | | | | | | | | | | | | | Until we have a better API in place for checking if a platform should select text with mouse or not, just disable it for now on iOS. Change-Id: Iabe64554dd1d8bb1deb6f232ef59e07ef1398b3f Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | iOS: Let CursorDelegate respond to cursorFlashTime from style hintsRichard Moe Gustavsen2016-04-261-2/+6
| | | | | | | | | | Change-Id: I4d8cf26272767a82c89cc1119afecfe1a0fedabd Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | iOS: Remove text selection handlingRichard Moe Gustavsen2016-04-266-141/+1
| | | | | | | | | | | | | | | | Text selection and overlay are now done from the iOS platform plugin. Change-Id: I3903ab05816775f75708e915780f549e62797135 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Add support for QT_QUICK_CONTROLS_1_STYLEJ-P Nurmi2016-04-222-6/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | Takes priority over QT_QUICK_CONTROLS_STYLE to allow specifying system wide style name preferences separately for Qt Quick Controls 1 and 2. [ChangeLog][Controls] Added support for a QT_QUICK_CONTROLS_1_STYLE environment variable, which takes priority over the existing variable QT_QUICK_CONTROLS_STYLE. This allows specifying system wide style name preferences separately for Qt Quick Controls 1 and 2. Change-Id: I0e40c2790c24b7ef66b1995b8337e573bb2f75a2 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | qtquickcontrols-examples.qdoc: Remove Basic Layouts Example.Friedemann Kleint2016-04-181-14/+0
| | | | | | | | | | | | | | | | | | | | | | Amends change 1c5f765658432a08ed52523c3a4547ab2b4a58f1, fixing qdoc-warnings: ../qtquickcontrols/src/controls/doc/src/qtquickcontrols-examples.qdoc:127: warning: Cannot find file 'basiclayouts/basiclayouts.pro' or 'basiclayouts/basiclayouts.qmlproject' ../qtquickcontrols/src/controls/doc/src/qtquickcontrols-examples.qdoc:127: warning: EXAMPLE PATH DOES NOT EXIST: basiclayouts Change-Id: I0bacabb2b611bfb0095ae216532bcc490747d092 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@qt.io> Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
* | Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1Liang Qi2016-04-089-8/+10
|\ \ | |/ | | | | Change-Id: Ic78345c599719f3dd80b1d6a6004d46a085da4af
| * Purge sRGB chunks from PNGs in documentation.Edward Welbourne2016-03-225-0/+0
| | | | | | | | | | | | | | | | Subjects each *.png file that matched grep -law "sRGB" to: pngcrush -ow -brute -rem allb -reduce -force Change-Id: I88acc450a8af929b011286d2ba2f81e75ed0faa9 Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
| * Doc: Add missing closing brace to a code snippetTopi Reinio2016-03-101-2/+3
| | | | | | | | | | | | | | | | And switch to use \qml instead of \code, as the snippet is valid QML. Change-Id: I0680eb0427fd3537ab052bb20ce5d7468545ccb0 Task-number: QTBUG-51715 Reviewed-by: Nico Vertriest <nico.vertriest@theqtcompany.com>
| * Fix hiding of horizontal scrollbar when content changesJoni Poikelin2016-03-101-2/+2
| | | | | | | | | | | | Task-number: QTBUG-50841 Change-Id: I189745968f9821e324ac25ed64a824bc8eaa9b23 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Clarify Slider::tickmarks' purposeMitch Curtis2016-03-091-1/+4
| | | | | | | | | | Change-Id: I53d43d03216425e7493e7381ea31f1dfbf553d58 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
View Lorry Controller Status