summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* | | Merge remote-tracking branch 'origin/5.7' into devLiang Qi2016-08-0250-72/+205
|\ \ \ | |/ / | | | | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: Iab80dd0c2bea54171971fd7a9538000908ed90d5
| * | Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-08-0110-14/+50
| |\ \ | | |/ | | | | | | Change-Id: I316bcbbc5308fda27728df15db1e780aa073da2a
| | * 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-07-281-1/+1
| | | | | | | | | | | | | | | | Change-Id: Ib187ee4e25cf4175a4b93acc607210fd5987304f
| * | | 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-063-0/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-064-13/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
| * | | Adding white space to names for item libraryThomas Hartmann2016-07-011-5/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: If4298f002ff17e737e49b468a17de7b115570bb1 Reviewed-by: Mitch Curtis <mitch.curtis@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-2230-30/+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>
* | | | Tests_Calendar: don't test that the calendar is hovered after a pressMitch Curtis2016-07-201-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't really make sense. Rather wait until after we start moving the mouse. We have another test dedicated to testing hover events. Task-number: QTBUG-54833 Change-Id: I0db8001cd5e069d41dd69be5bf1e0635142426f1 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Frederik Gladhorn <frederik.gladhorn@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>
View Lorry Controller Status