aboutsummaryrefslogtreecommitdiffstats
path: root/examples
Commit message (Collapse)AuthorAgeFilesLines
* 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>
* wearable: add demo modev5.12.0-beta1Mitch Curtis2018-09-2720-24/+507
| | | | | | | | | | | This change adds a switch in the settings page that enables demo mode. In this mode, each screen and UI control will be visited and interacted with in a loop until the screen is tapped, at which point it returns to the launcher page. Change-Id: Icb306e23985d8c1f82725a95ed7f2e34b3d6c03f Reviewed-by: Mikhail Svetkin <mikhail.svetkin@qt.io> Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* wearable: add a dark theme with a runtime switch on the Settings pageMitch Curtis2018-09-2799-105/+291
| | | | | Change-Id: Iaa205c19aa413de7a5537f17f74d969547d5e558 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* wearable: bump import versions to 5.10Mitch Curtis2018-09-2717-33/+33
| | | | | | | | Some API we need is only available in later versions. Don't go past 5.10 for now, because the support isn't there yet. Change-Id: I6915d34ef37b47b9b07e6e4aa85c90ff2e8b59b2 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* wearable: fix items still being visible when returning to LauncherPageMitch Curtis2018-09-107-10/+77
| | | | | | | Hide SwipeView items when appropriate, as it's not done automatically. Change-Id: Ic716da004794b7d0eba65c220f6242d4113302d9 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* gallery: strip png metadata to avoid warningMitch Curtis2018-07-3012-0/+0
| | | | | | | | | | | | | The warning was: "libpng warning: iCCP: known incorrect sRGB profile" The metadata was removed with this command: optipng -o7 -strip all *.png Change-Id: Icc8f365becb25f8267f93383de9ec78c18f6a03e Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Examples: don't use anchors in layoutsMitch Curtis2018-02-162-6/+5
| | | | | Change-Id: I9130e8d143b1f6b2ac6ec2839e47858db3e67dff Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Docs: fix qdoc (clang) warningsJ-P Nurmi2018-02-132-2/+2
| | | | | | | | | qtquickcontrols2-automotive.qdoc:28: (qdoc) warning: EXAMPLE PATH DOES NOT EXIST: automotive qtquickcontrols2-musicplayer.qdoc:28: (qdoc) warning: EXAMPLE PATH DOES NOT EXIST: musicplayer qquickspinbox.cpp:814: (qdoc) warning: Can't link to 'textFromValue()' Change-Id: Iec6fd398cca98b514a76fe9f2f30c79a59b81457 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/5.10' into 5.11J-P Nurmi2018-01-312-2/+2
|\ | | | | | | Change-Id: I7c0333dbf959124f6cf5be7837a305b65c08d290
| * Use shorter ':/' prefix for Imagine style example config pathsMitch Curtis2018-01-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | Using either :/ or qrc:/ will work because we handle both cases in QQuickImagineStyle::url(), but for local file paths, we don't have any handling for the file:// prefix. This patch just makes the examples more consistent. A follow up patch will document examples of specifying the different types of paths. Change-Id: Ib7fc2fe012242f9b225b4380ca066107b77d0680 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.10' into devLiang Qi2018-01-091-1/+3
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf src/quicktemplates2/qquickabstractbutton_p.h Change-Id: I265cbd2ce51beaf2afef99292c2e2798dadb4ba3
| * Merge remote-tracking branch 'origin/5.9' into 5.10J-P Nurmi2017-12-151-1/+3
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: .qmake.conf examples/quickcontrols2/quickcontrols2.pro src/imports/controls/ComboBox.qml src/quicktemplates2/qquickabstractbutton.cpp src/quicktemplates2/qquickabstractbutton_p.h src/quicktemplates2/qquickapplicationwindow_p.h src/quicktemplates2/qquickcombobox.cpp src/quicktemplates2/qquickcontainer.cpp src/quicktemplates2/qquickcontrol.cpp src/quicktemplates2/qquickcontrol_p.h src/quicktemplates2/qquickcontrol_p_p.h src/quicktemplates2/qquicklabel_p.h src/quicktemplates2/qquicklabel_p_p.h src/quicktemplates2/qquickslider_p.h src/quicktemplates2/qquickspinbox.cpp src/quicktemplates2/qquicktextarea_p.h src/quicktemplates2/qquicktextarea_p_p.h src/quicktemplates2/qquicktextfield_p.h src/quicktemplates2/qquicktextfield_p_p.h tests/auto/auto.pro tests/auto/controls/data/tst_combobox.qml Change-Id: I34cdd5a9794e34e0f38f70353f2a2d04dfc11074
| | * Example flatstyle needs widgets modulePeter Seiderer2017-11-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes compile with disabled widgets module. Task-number: QTBUG-64761 Change-Id: I743884d77d51e89061d87cab006bab0cafc9ddb7 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | | Merge remote-tracking branch 'origin/5.10' into devJ-P Nurmi2017-11-06288-31/+3164
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/quickcontrols2/qquickchecklabel.cpp src/quickcontrols2/qquickchecklabel_p.h src/quickcontrols2/qquickmnemoniclabel_p.h src/quicktemplates2/qquickbuttongroup_p.h src/quicktemplates2/qquickspinbox.cpp src/quicktemplates2/qquickswipedelegate.cpp Change-Id: I1278b78dcaf25be5698f34751193b83dc951eb3c
| * | Add Music Player Imagine style exampleMitch Curtis2017-11-03156-1/+1440
| | | | | | | | | | | | | | | Change-Id: If285e90d25d497155c060907b8f8c60859e55a9a Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Add Automotive Imagine style exampleMitch Curtis2017-11-03114-1/+1658
| | | | | | | | | | | | | | | Change-Id: I7d7e49d0d4e1cbd61892215677c7ea0c5471af02 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
| * | Wearable Demo: make use of the icon supportJ-P Nurmi2017-11-0219-30/+67
| | | | | | | | | | | | | | | Change-Id: I7a691f7b7c3d2f2a9f1d9a1ded29269184ddfcfe Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Replace Q_DECL_OVERRIDE with overrideKevin Funk2017-09-222-4/+4
|/ / | | | | | | | | Change-Id: Ib7dc6679748dc6c88f7bad3896b2e2e3b048c987 Reviewed-by: Lars Knoll <lars.knoll@qt.io>
* | Doc: Edit languagev5.10.0-alpha1Venugopal Shivashankar2017-09-073-37/+36
| | | | | | | | | | | | | | | | | | - Fixed pucntuation issues and typos - Removed redundant text Task-number: QTBUG-60647 Change-Id: I1ab0e8e62a2e3f4997629653b659f130c13db007 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-07-1120-20/+20
|\| | | | | | | | | | | | | | | Conflicts: .qmake.conf tests/auto/controls/data/tst_scrollindicator.qml Change-Id: I1f5581ae7814c0d4152e4c9b79a30a8af5a3a17b
| * Example: Replace spaces from the image file nameVenugopal Shivashankar2017-07-1019-18/+18
| | | | | | | | | | | | | | | | | | | | Updated the corresponding qml files where these images are used. The spaces in file name stops qdoc from listing the file in the example page. Change-Id: I45b24ec88d367fe229fe365eeb611b86de805e0d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
| * Doc: fix the anchors.fill links in the Chat TutorialJ-P Nurmi2017-07-041-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | There was a QDoc warning: qtquickcontrols2-chattutorial.qdoc:28: warning: Can't link to 'anchors.fill' and the anchors.fill links weren't actually linking to the anchors property but just to the beginning of the QML Item docs. Change-Id: I66f66765443e5b75af8198309f9f7482e70ea2d3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Doc: List the corresponding source files and images under each chapterVenugopal Shivashankar2017-07-051-0/+15
| | | | | | | | | | | | | | | | | | | | In a tutorial such as this, listing all the example files and images at once towards end of it is confusing. Qdoc enables to turn off the auto-generated list and explicitly list the files wherever necessary. Change-Id: Ifbb258af5ad35bd2df976eb793a14fd5873ceed9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-291-22/+49
|\| | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickmenu.cpp Change-Id: I595ed1671fcad6c3b87123be2b825bca09552f0f
| * Doc: Improve tone at the beginning of the tutorialVenugopal Shivashankar2017-06-281-22/+49
| | | | | | | | | | | | | | | | | | | | The tutorial now sounds like it is leading the reader through a series of changes to the default code that came with the "Qt Quick" application template. Change-Id: I6e46e720df9668dff435541ebd97bdaa6a7c02ad Reviewed-by: Nico Vertriest <nico.vertriest@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Add Overlay attached properties and signalsJ-P Nurmi2017-06-261-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ChangeLog][Controls][ApplicationWindow] Deprecated the overlay grouped property in favor of the newly introduced Overlay attached properties. [ChangeLog][Controls][Overlay] Introduced Overlay attached properties and signals that supersede the overlay grouped property in Application Window. The Overlay attached type allows providing background dimming for popups without requiring an ApplicationWindow instance. Task-number: QTBUG-61336 Change-Id: I9df11bcb167e7725014d5f058fe24d70da4a10b3 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-06-0645-1/+39
|\| | | | | | | | | | | | | | | | | | | | | | | | | Fusion style ComboBox popup height was adjusted according to 90a0d402 to make tst_controls::ComboBox::test_emptyPopupAfterModelCleared pass with the Fusion style. Conflicts: src/imports/controls/ComboBox.qml src/imports/controls/material/ComboBox.qml src/imports/controls/universal/ComboBox.qml Change-Id: I2bad826dc56de9d8952ea2a9ace950c7cf3cbc58
| * Merge remote-tracking branch 'origin/5.9.0' into 5.9Liang Qi2017-05-3145-1/+39
| |\ | | | | | | | | | Change-Id: Iba044084bf82f6b2b8ceba4aa2a80bdcf8fc38e0
| | * Wearable Demo: fix fuzzy images on retina screensJ-P Nurmi2017-05-1545-1/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | Even though retina screens are not the primary target of the wearable demo, users can try out the demo on desktop. Provide crispy @2x image assets to give a better impression for those who have retina screens. Change-Id: If88367e14c586fd9718f43bbae73dee547d54aaf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | | Merge remote-tracking branch 'origin/5.9' into devJ-P Nurmi2017-05-302-4/+0
|\| | | | | | | | | | | | | | | | | | | | Conflicts: src/quicktemplates2/qquickrangeslider.cpp Change-Id: I7eb990cfdc91173f86552841ba16536b35ea09cf
| * | remove bogus QTPLUGIN+=qsqlite magicOswald Buddenhagen2017-05-292-4/+0
| |/ | | | | | | | | | | | | | | | | | | | | the code was originally meant to link the plugin if it's not built into qtsql. this logic did not survive the various build system refactorings, but it's also entirely pointless, because available static plugins are now automatically linked. Change-Id: If4b5bb3387f21aef98aa55257dd5b94f953822c5 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io> Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* | Gallery: remove unneeded Material-specific iconsJ-P Nurmi2017-05-2412-0/+0
| | | | | | | | | | | | | | | | | | ToolButton was changed to tint the icon so that it always follows the foreground color. Thus, it's no longer necessary to ship white versions of the icons for the Material style. Change-Id: Ibe5accc1b39559c9dfc2f94fbf3c9c323b91fe63 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* | Gallery: utilize the new icon-support for the tool buttonsJ-P Nurmi2017-04-2628-14/+32
|/ | | | | Change-Id: I275856925ebf82c0ed8822d45299fd4d5c9218ba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Gallery: handle Menu shortcut on mobileJ-P Nurmi2017-04-061-0/+5
| | | | | Change-Id: Ie7ad814b3999791801c60776777c6a736db1c093 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Gallery: handle Back shortcut on mobileJ-P Nurmi2017-04-061-2/+2
| | | | | | | | | Menus, dialogs, and drawers already handle it out of the box, but for page/stack navigation we need an explicit shortcut. Change-Id: Iad3e05f0fc31dbd66e3b1aa9286f8ef076fcff0d Task-number: QTBUG-58105 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: prepare the launcher page icons for high DPI and stylingJ-P Nurmi2017-03-2912-12/+12
| | | | | | | | | | Separate the icon and its background to make the background stylable and to provide the icons in high DPI versions later. Some icon files have been renamed to match the sub-app name. When this example reaches dev, we can use the built-in icon support with named icons. Change-Id: Id87d1a001476194eb7e803802c90e7089f92b3b1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: update the Wearable Demo docsJ-P Nurmi2017-03-282-99/+111
| | | | | | | | | | The demo was originally written to become a Qt Quick demo. Focus on the QQC2 specifics now that it became a QQC2 demo instead. There were also some outdated references after being refactored a bit after the initial submission. Change-Id: I96ef3f4745a295b2d8ab12a30fcbdf41a2c50626 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: get rid of the UIStyle dimensionsJ-P Nurmi2017-03-132-13/+2
| | | | | Change-Id: Ia4896fd2253cea9bc83bdd59bfdbaace216a9cb9 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup FitnessPageJ-P Nurmi2017-03-131-4/+0
| | | | | Change-Id: I0ed565b04236ad4550b278e0a223636794d52bbf Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup WeatherPageJ-P Nurmi2017-03-131-51/+16
| | | | | Change-Id: Iaed6c6370e9a8ec7e6e523ee87802d51531f5bba Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup NotificationsPageJ-P Nurmi2017-03-131-74/+41
| | | | | Change-Id: Idc8376405e113a9837fbe43fbf85681cf9ed8737 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup NavigationPageJ-P Nurmi2017-03-132-19/+12
| | | | | Change-Id: I3e6a3ffbcca962602d08aa9effce981396cc3cdb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: center align the world clocksJ-P Nurmi2017-03-131-6/+1
| | | | | Change-Id: I9389597db13acee93e66ee6979fae5e2dd5a0e90 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: cleanup AlarmsPageJ-P Nurmi2017-03-133-140/+31
| | | | | Change-Id: I918e69a8396cf57dd685cc2116722618a3d7fda4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Wearable: tweak the page indicatorsJ-P Nurmi2017-03-137-30/+13
| | | | | | | Move bottom margin from anchors as bottom padding to define it once. Change-Id: I2a93f86e2029c38f1d39555a55d969faec716d04 Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
* Wearable: cleanup unnecessary currentIndex & clippingJ-P Nurmi2017-03-138-15/+0
| | | | | Change-Id: Ic0071690388871fcbb09af5f3b7255f1a7f81bcd Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-03 20:40:54 +0000