aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* Native style: enhance exampleRichard Moe Gustavsen2020-06-182-0/+7
| | | | | Change-Id: I61805084d21947becc8a48119a113b94cfa897d2 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Native style: add ProgressBarRichard Moe Gustavsen2020-06-175-1/+222
| | | | | Change-Id: Ie48002b083615afd4f8f8ab3b1303a8f5c39f81b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* NativeStyle: add ScrollBarRichard Moe Gustavsen2020-06-124-0/+240
| | | | | Change-Id: Ied2055866a67798ce60105e7251740a3e66b38db Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* NativeStyle: add ComboBoxRichard Moe Gustavsen2020-06-094-0/+220
| | | | | | Change-Id: Ia6387857ba012ba7f6df453e64dd9419f7979db8 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Jan Arve Sæther <jan-arve.saether@qt.io>
* Merge remote-tracking branch 'gerrit/dev' into nativestyleRichard Moe Gustavsen2020-06-0415-14/+139
|\ | | | | | | Change-Id: I384f9045027d8e6ab18e84ce01c4b263161ca473
| * Remove Qt Labs CalendarMitch Curtis2020-05-2815-14/+139
| | | | | | | | | | | | | | | | | | | | This is getting its own repository as part of the move to the marketplace. Task-number: QTBUG-84172 Pick-to: 5.15 Change-Id: I2f963c298d6ef95e0832f95aa1e1ea809f4867a2 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
* | Native style: always show scrollbar on desktopRichard Moe Gustavsen2020-06-031-1/+1
| | | | | | | | | | | | | | It just looks more desktop-ish. Change-Id: Ief348bf87f447bc5c1514ae46bc00578319ddd7d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Native style: add TextAreaRichard Moe Gustavsen2020-05-284-0/+182
| | | | | | | | | | Change-Id: Ie8a4ea4ff232fa5aa3064b56aa7ba13f8522590d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Native style: add FrameRichard Moe Gustavsen2020-05-274-0/+131
| | | | | | | | | | Change-Id: Ide8f2910c54a378c8c9d03554718de54feb9cf20 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Native style: copy QStyle from widgets, and implement ground work for ↵Richard Moe Gustavsen2020-05-2523-0/+1942
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | creating native styles This is the initial patch for adding native style support to controls2. The gist of the patch is that it copies QStyle from widgets (including the mac plugin style), remove all notions of widgets, tweak it as needed, and make it compile inside the qtquickcontrols2 repository as a separate QML plugin (QtQuick.NativeStyle). The "new" QStyle is then used to draw primitives onto nine-patch-images that can be rendered by the scene graph. Each such primitive/image will be wrapped by a QQuickStyleItem (which is a subclass of QQuickItem). E.g a button background will be implemented by QQuickStyleItemButton.cpp. This item can then be placed anywhere in the QML code to draw a native-looking button background. Controls2 has its own styling API, where a style consist of a set of QML files that extend template controls written in C++. To enable native styling, we simply follow the exact same approach; We create a style folder per platform alongside the other styles in controls2. Each style will contain a set of qml files for the controls (Button.qml, Slider.qml, etc), and inside each control, the style items will be used to draw the default delegates. Since it's likely that each such qml file will be implemented equal in all the desktop styles (but not always), the native style plugin contains a set of default controls (e.g DefaultButton.qml) that a platform style can choose to inherit from and extend as needed. Included is also an example called "DesktopGallery" that can be used to test and view the controls. Change-Id: I8b45aa7d493930f552d3ad2e3e3e7184129a9d6c Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Reduce dependencies on QtGraphicalEffectsMitch Curtis2020-05-131-0/+2
| | | | | | | | - Make QtGraphicalEffects optional in tests - Mention that QtGraphicalEffects is required for relevant examples Change-Id: I3ac7d06add931e0a10c3df7edc4e458ba5519c75 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Remove bindings to parent in delegatesMitch Curtis2020-05-1111-11/+13
| | | | | | | | | | | | | | | Until we've decided whether to a) document that properties of parent should not be bound to in delegates or b) fix the warning that results from doing so after 8c72e634b3b0eacbfdee883bfc34994d3c19ed77, we can pre-emptively clean up a few places where it happens. Task-number: QTBUG-81976 Task-number: QTBUG-82393 Task-number: QTBUG-82989 Pick-to: 5.15 Change-Id: I1e610613f6016ec1b9cf9ca33cdfb15d384731a8 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Add special case for escaping quotesSamuli Piippo2020-03-311-1/+1
| | | | | | | | | <command-line>: warning: missing terminating " character <command-line>: error: stray ‘\’ in program Change-Id: Iab23419a707a105a9789b8d7af3740e320d54119 Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* CMake: Regenerate projectswip/cmakeAlexandru Croitor2020-03-171-1/+1
| | | | | | Change-Id: Ifd6b2289de6465a010f5f2a32789221767b4d5be Reviewed-by: Leander Beernaert <leander.beernaert@qt.io> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2020-03-173-1/+22
|\ | | | | | | Change-Id: Ieb9bcfba9651d646509afd065ce2389ef74448cc
| * Fix build failures as a result of QMetaType changes in qtbaseAlexandru Croitor2020-03-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | moc now stores the QMetaType of properties as a result of 46f407126ef3e94d59254012cdc34d6a4ad2faf2 in qtbase, which requires full type information about the property type inside the moc generated source file. Many of the property types were forward-declared, and this resulted in build errors like "invalid application of 'sizeof' to an incomplete type 'QQuickTransition'" Make sure to explicitly include the moc files inside the counterpart .cpp files, so that full information is available from included headers. Fixes: QTBUG-82774 Change-Id: I5971713864992398daed72ce9f6ab866668cf8e1 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Merge remote-tracking branch 'origin/5.15' into devSimon Hausmann2020-03-1028-59/+7
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/imports/controls/qtquickcontrols2plugin.cpp Change-Id: Ifc09ea9f71fdba119fe8eed99f0bdcb402444f27
| | * Gallery: simplify the code for the help featureMitch Curtis2020-02-1228-59/+7
| | | | | | | | | | | | | | | | | | | | | Use existing data from the model rather than adding new properties. Change-Id: I77f9b079d4ceefd1a0b9936b4250c2470c68836e Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
| * | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2020-02-0829-1/+72
| |\| | | | | | | | | | Change-Id: I4b20284eb05b6277c758a1ab5579b803db9a84ca
| | * Gallery example: Add "Help" menu and shortcutFriedemann Kleint2020-01-1028-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a property "control" identifying the control to be demo-ed to the page and add a help shortcut and menu item displaying its help. Change-Id: Ic3c7c31f5a44fccd57ee018fd3681dc6bdffee58 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Paul Wicking <paul.wicking@qt.io> Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
| | * Merge remote-tracking branch 'origin/5.14' into 5.15Liang Qi2019-12-301-1/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/controls/data/tst_combobox.qml Change-Id: I8471cdac4397f77a8e58140d58c6b50d3c437928
| | | * clang-tidy: fix cppcoreguidelines-pro-type-member-initMitch Curtis2019-12-121-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Ensure that all members are initialized and remove an unused member. Change-Id: Ibfb3ea86b7791cd6f8683b68e7cd3bc4256b33f7 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeLeander Beernaert2019-11-25306-9/+8
|\| | | | | | | | | | | | | | | Change-Id: I61919fabd4a3a07ed374f2c3c1fae2d589d6e124
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-16304-0/+0
| |\| | | | | | | | | | | | | | Change-Id: I647fa31fafdaea46c341c515f97b7f793ddf4b31
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-09304-0/+0
| | |\| | | | | | | | | | | | | Change-Id: Ib14b8c77cefe7aaf5b11483d9a30b2ef05314598
| | | * Run optipng on all imagesMitch Curtis2019-11-04304-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | find . -name "*.png" -exec optipng -o 7 -strip all {} \; Change-Id: I2238b2dd38813d33ed48d79817f872f922cfa28d Fixes: QTBUG-79275 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-11-091-8/+7
| |\| | | | | | | | | | | | | | Change-Id: I80f13e604dd492954c742e0ddaa7efa393776a62
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-11-021-8/+7
| | |\| | | | | | | | | | | | | Change-Id: Ida6e83517802b1e970f755b2e2128b77f08a8d11
| | | * texteditor: update links in html fileMitch Curtis2019-10-241-8/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: I7e3bd670039d181fb562967c5e9d3830f63d46a3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
| * | | Merge remote-tracking branch 'origin/5.15' into devQt Forward Merge Bot2019-10-191-1/+1
| |\| | | | | | | | | | | | | | Change-Id: I770f99d20878ddf16ab3f4b1a5422e7192622f64
| | * | Merge remote-tracking branch 'origin/5.14' into 5.15Simon Hausmann2019-10-181-1/+1
| | |\| | | | | | | | | | | | | Change-Id: I0b6bd9acd2262ae87e1086a0450875a8f04a0423
| | | * Doc: Rename section called StackViewNico Vertriest2019-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - a section title in a tutorial shouldn't be the name of a QML type only Task-number: QTBUG-78799 Change-Id: I661b639eb96926be2b92899fdbe241890d4ed6f4 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* | | | Regenerate projects to be in syncAlexandru Croitor2019-11-1514-16/+14
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a57449c9025e22414b8337fcffdeb0f4d769af2 Reviewed-by: Liang Qi <liang.qi@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | | | Merge remote-tracking branch 'origin/dev' into wip/cmakeAlexandru Croitor2019-10-1513-46/+85
|\| | | | | | | | | | | | | | | | | | | | | | | Removed dependencies.yaml. Change-Id: I1e2b3f486e9ace4bc8dc0419a64848990b3a6b39
| * | | Fix duplicate entry in projcet listLeander Beernaert2019-09-201-1/+0
| |/ / | | | | | | | | | | | | | | | | | | Remove double entry for wearable subdirectory. Change-Id: I0038c9435511766815b9626a4e870b2317b04f0f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | Merge remote-tracking branch 'origin/5.14' into 5.15Qt Forward Merge Bot2019-09-079-22/+59
| |\| | | | | | | | | | Change-Id: I23522a8f71cea8d8e3f0155dad98e41c003774fb
| | * Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-09-061-17/+24
| | |\ | | | | | | | | | | | | Change-Id: I859406dc779e59ee5d8e2980e04f8be28b1a69aa
| | * \ Merge remote-tracking branch 'origin/5.12' into 5.13Qt Forward Merge Bot2019-08-241-1/+1
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ib3ebf5d1ec84a9db722e7634d77bf424c37c52ce
| | * | | Doc: Replace the "Qt Quick Controls 2" instancesVenugopal Shivashankar2019-08-226-20/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that Controls 1 is deprecated, it's ideal to use "Qt Quick Controls" instead of "Qt Quick Controls 2". Task-number: QTBUG-70333 Change-Id: Ie745db4b61071ddb5e06150d4e739cda74c59f41 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
| | * | | TextEditor: Add modified handlingFriedemann Kleint2019-08-213-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a modified property to the document and add handling in onClosing(). Connect the actions to call close() instead of Qt.quit() for it to become active. Change-Id: I0fec75629db64e91508ed8ba45d4fb60be146b1b Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | | Adapt to new Connections syntaxUlf Hermann2019-09-061-5/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Fixes: QTBUG-77734 Change-Id: I22b0c6a46e10780e02c56c250356f1aa87d1050f Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | | Modernize Gallery example by using Action where suitableKonstantin Ritt2019-09-051-17/+24
| | |/ | |/| | | | | | | | | | Change-Id: I45c693941e88074eb63f9e6a498c85c1dfa93e9a Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * | examples: type userto -> userAlbert Astals Cid2019-08-221-1/+1
| |/ | | | | | | | | Change-Id: I99d9ea22fd51aa4e9da469b630b319ba71215558 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Regenerate examplesAlexandru Croitor2019-10-1115-14/+35
| | | | | | | | | | Change-Id: I8a55e330f8f251df1498f1b906d25b3311f5fd70 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* | Conversion of QtQuickControls2 examplesLeander Beernaert2019-10-0817-0/+1461
|/ | | | | | | | Initial Conversion of QtQuickControls2 examples. Change-Id: I21ddf792d039dc26e4ba58d8592101eb131618d3 Reviewed-by: Qt CMake Build Bot Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Merge remote-tracking branch 'origin/5.12.0' into 5.12Qt Forward Merge Bot2018-12-0583-168/+168
|\ | | | | | | Change-Id: I7fe9e74beff3cdbfbf02ee0f129a8204ad31046e
| * Tie minor version of all imports to Qt's minor versionMitch Curtis2018-11-0283-168/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes all Qt Quick Controls 2 imports match the current Qt minor version, which is 12 as of this patch. It also updates all other Qt Quick imports to match. This will also make future version bumps easier as all version numbers in existing code/docs will match. The following commands were used to verify that no old versions remain: for i in `seq 0 11`; do git grep "import QtGraphicalEffects.*1.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick 2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Layouts 1.$i$"; done for i in `seq 0 5`; do git grep "import QtQuick.Controls.*2.$i$"; done for i in `seq 0 11`; do git grep "import QtQuick.Templates 2.$i as T$"; done [ChangeLog] From Qt 5.12 onwards, all import versions in Qt Quick Controls 2 follow the same minor version as Qt's minor version number. For example, the import version for Qt 5.12 is: "import QtQuick.Controls 2.12". Change-Id: I6d87573f20912e041d9c3b7c773cc7bf7b152ec3 Fixes: QTBUG-71095 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* | Doc: Update \titles with "Controls 2" in itVenugopal Shivashankar2018-12-0410-10/+20
| | | | | | | | | | | | | | | | Alternatively, the old \title is now a \keyword, to avoid broken links to the page. Change-Id: Ib8b97efe8be13559c45c7ca430b2afc93edaa3e7 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Stop using wildcards with "direct" RESOURCES syntax in examplesMitch Curtis2018-10-314-10/+73
|/ | | | | | | | | | | Build tools cannot detect when new files are added with this syntax. As we don't use wildcards with SOURCES, we also shouldn't use them with RESOURCES either. Change-Id: Ic42ee9d892a4f18a1a21bd757d7398a50792a6c7 Fixes: QTBUG-71321 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
* Doc: Ensure all links to 'Qt Quick Controls' lead to controls 2Venugopal Shivashankar2018-10-2910-1/+11
| | | | | | | | | | The name of the documentation module is also changed from 'qtquickcontrols2' to 'qtquickcontrols', and this is reflected in other modules' dependencies and licensing source files (qt_attribution.json). Task-number: QTBUG-70333 Change-Id: I2ba308b7eddae3af00dfb49a751cac8527c46bba Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-20 13:33:18 +0000