aboutsummaryrefslogtreecommitdiffstats
path: root/src/templates/qquickstackview.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Templates: rename the C++ module to qtquicktemplates2J-P Nurmi2016-04-131-989/+0
| | | | | Change-Id: I146da903b46f5c2caf865e37291c25376b49021a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: Rename Qt Labs Controls to Qt Quick Controls 2Nico Vertriest2016-04-071-2/+2
| | | | | | | | Replaced all remaining instances of "Qt Labs Controls" Change-Id: Iab8ca27d98a16a7c99bd364c66efc8b98d93eacc Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com> Reviewed-by: Martin Smith <martin.smith@theqtcompany.com>
* Rename Qt Labs Controls to Qt Quick Controls 2 - doc asset filenamesMitch Curtis2016-03-181-1/+1
| | | | | | | | | This renames all documentation assets (snippets, images), but leaves .qdoc files and the .qdocconf file in an attempt to avoid conflicts with controls 1. Change-Id: I08692233e8d645de8d9746fe74edc14d31bb744e Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: update doc Qt Labs ControlsNico Vertriest2016-03-101-1/+1
| | | | | | Change-Id: I49a8632b0561483e6090577ae17fd7bdeb4da6ec Task-number: QTBUG-50933 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Merge remote-tracking branch 'origin/5.6' into 5.7Liang Qi2016-02-151-0/+6
|\ | | | | | | | | | | | | Conflicts: .qmake.conf Change-Id: I4aae04ab8cac381b4a8262a2f47298ca014f4692
| * StackView: warn the user for using anchorsJ-P Nurmi2016-02-121-0/+6
| | | | | | | | | | Change-Id: I6c977e4bdc62820589a94700291d93b290d796ae Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Revert "Fix accessing StackView attached properties via popped item"J-P Nurmi2016-02-111-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 1cf60c89a8711103a37b0511f4e91ee28d984b45. The fix wasn't good. It leaves a dangling pointer around, which makes tst_stackview fail and often crash. Unfortunately the problem wasn't caught by the CI, because it didn't run qmltestcases at all. :) Change-Id: I7348f1b79a45715f8c5abec416e8a9864b0288e1 Task-number: QTBUG-50937 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
| * Fix accessing StackView attached properties via popped itemJ-P Nurmi2016-02-101-1/+2
| | | | | | | | | | | | Change-Id: I98d84668ce42687577539cb6356b87be9e2bdd98 Task-number: QTBUG-50937 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Templates: follow the Qt coding styleJ-P Nurmi2016-02-121-24/+30
| | | | | | | | | | | | | | | | | | Return early to keep the indentation low. This style was already used in many areas, so now the same style is consistently used everywhere. Change-Id: Ibc7c05147fdcf226ad1cbdd26cd70e1da89108af Reviewed-by: Liang Qi <liang.qi@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-02-071-0/+3
|\| | | | | | | | | | | | | Conflicts: src/imports/controls/universal/ToolButton.qml Change-Id: Ib9f1e7d83fb824d9e6a13a2bc429d1a5642fe4f6
| * Docs: add missing \readonly tagsJ-P Nurmi2016-02-061-0/+3
| | | | | | | | | | Change-Id: I314514bca07f9b23ac821d68ba8f3ce05341f1d9 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* | Merge remote-tracking branch 'origin/5.6' into devJ-P Nurmi2016-01-251-3/+13
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .gitignore src/templates/qquickcombobox_p.h src/templates/qquickmenu_p.h src/templates/qquickmenu_p_p.h src/templates/qquickoverlay_p.h src/templates/qquickpopup.cpp src/templates/qquickpopup_p.h src/templates/qquickstackview_p.cpp Change-Id: I89c7d518697beec0b81ef3a12205286a4f3ccf89
| * StackView: fix overly zealous child mouse event filterJ-P Nurmi2016-01-221-4/+12
| | | | | | | | | | | | | | Change-Id: Ife8ec7e14f940068a809cdf7a715a1790cce3f66 Task-number: QTBUG-50305 Reviewed-by: Nikita Krupenko <krnekit@gmail.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
| * Docs: add notes about the Qt.labs moduleJ-P Nurmi2016-01-191-0/+2
| | | | | | | | | | Change-Id: I65c37f661689bf30e7a9119bb877dce68eeb634c Reviewed-by: Topi Reiniö <topi.reinio@theqtcompany.com>
* | C++11 keywordsJ-P Nurmi2016-01-211-20/+20
| | | | | | | | | | | | | | | | - Q_NULLPTR -> nullptr - Q_DECL_OVERRIDE -> override Change-Id: I8ee65caafd43ab41b6de43835200cac6c8ffa278 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* | Templates: replace foreach with range-based forAnton Kudryavtsev2016-01-151-1/+1
|/ | | | | Change-Id: Iadb9971e01bbf561e37938e5a2b36fbce0af68a5 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: remove obsolete reference to Pushing Items from Qt Quick ControlsNikita Krupenko2016-01-051-1/+0
| | | | | Change-Id: If94d9ffcfc17ea87a95205bc689fd916f22ddc70 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: fix code snippets in StackViewNikita Krupenko2016-01-051-2/+2
| | | | | Change-Id: I73e1d49dcdde1ac0ca69ab3d1502489e20352cb3 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* StackView: fix stack clear on replace of the topmost itemNikita Krupenko2016-01-041-1/+1
| | | | | | | | | | | | | | | On item replace, StackView pops the topmost item (to use in transition) and call QQuickStackViewPrivate::replaceElements(), which delete items until it find the target item. When replacing the topmost item, it just clear the whole stack, as the target item not in the stack already and it procced to the bottom of the stack. This commit changes StackView to use pushElements() for replacing the topmost item, as there is nothing to replace. Task-number: QTBUG-50274 Change-Id: Iff2e1177ee2f8b2d4518b519b450ae4e89a4c963 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: fix attached property name in StackViewNikita Krupenko2016-01-041-1/+1
| | | | | Change-Id: I2d93803ddf64beb3fdc96b4ca76d58dbcba3bcdb Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix StackView resizingJ-P Nurmi2015-12-161-7/+2
| | | | | Change-Id: Ib09996a9f12b669ae10fb7197f1e5b443540f7b0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Fix StackView::busy and child event filteringJ-P Nurmi2015-11-021-2/+2
| | | | | | | | | | | 1) renamed busy() to isBusy() to follow the Qt convention :) 2) fixed spurious busyChanged() emissions (it was always emitted on push/replace/pop even when the state didn't change (null transitions) 3) with null transitions, the child event filter was never turned off and therefore StackView "froze" after the first push/replace/pop Change-Id: I07fffa73db5a182865c7b2779641e1f95ed8b30b Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* StackView: add dedicated replace transitionsJ-P Nurmi2015-10-231-5/+57
| | | | | | Change-Id: I614d11bb566c96166ebf8bc0d2f5d4286d823a5f Reviewed-by: Kai Uwe Broulik <kde@privat.broulik.de> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Docs: disambiguate group sectionsJ-P Nurmi2015-10-201-1/+1
| | | | | | Change-Id: Ia6e8a53b8b5261e1efd80dcd3351cd216d34edf4 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Docs: Containers groupJ-P Nurmi2015-10-191-1/+2
| | | | | Change-Id: I5eb80f21edb50413b33a96b934466964e56462aa Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Docs: Navigation groupJ-P Nurmi2015-10-191-1/+4
| | | | | Change-Id: Id866d226fc651a39fffd887600b4bf54d2b7ac6e Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* StackView: add some missing docsJ-P Nurmi2015-10-121-25/+164
| | | | | | Change-Id: Ic9bb568c4c7d7f78b55227e55b039c19eb0f7e0a Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com> Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
* Fix StackView attached propertyJ-P Nurmi2015-10-111-24/+20
| | | | | | | | | The attached properties weren't initialized at all for the initial item. Furthermore, the properties were initialized lazily, which made them work for imperative tests, but not correctly in bindings. Change-Id: I783c406dcf4e1cf27a6b4e6ddd43214cb06a3c7a Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Docs: use constant-value -tables for supported enum valuesJ-P Nurmi2015-10-041-8/+4
| | | | | Change-Id: I6243e08099d1fdd0584817f7ff5ccf5825a8cae0 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0J-P Nurmi2015-10-011-18/+18
| | | | | Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Rename QtQuick.Templates 2.0 to Qt.labs.templates 1.0J-P Nurmi2015-10-011-1/+1
| | | | | | Change-Id: I3263a600065dfa2bfe7334ec44a74e2dca83aa36 Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>
* Doc: Fixes required to avoid the following qdoc warningsVenugopal Shivashankar2015-09-281-1/+1
| | | | | | | | | qtquickcontrols2-index.qdoc:28: warning: Can't link to 'No' qquickstackview.cpp:46: warning: Can't link to 'replace()' Change-Id: I44cc2fab7d6b745175d0cbd3636b8025eb415c70 Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Doc: Replaced the module name qualifier used for QML docsVenugopal Shivashankar2015-09-231-17/+17
| | | | | | | | Also made changes to avoid qdoc warnings about qml snippets. Change-Id: Ide047fe7a4901fcf4b03efdccf457662e60585d2 Reviewed-by: Topi Reiniö <topi.reinio@digia.com> Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
* Rename libQtQuickControls to libQtQuickTemplatesJ-P Nurmi2015-09-161-0/+783
Change-Id: I1e663bb7be2be8b3d4edf0c038862cc2150aec40 Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>