aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2
Commit message (Collapse)AuthorAgeFilesLines
* Flatstyle example: use qt_add_qml_module() in CMakeLists.txtOliver Eftevaag2022-11-061-26/+18
| | | | | | | | | | | qt_add_qml_module() should be used instead of qt_add_resources() for adding resources to examples in qtdeclarative. Task-number: QTBUG-98130 Change-Id: I41adae7f861f6cbcc13a735a43e8b5dd3ec31934 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 5663b772e02758a0c1f45a556061b25c68796da5) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Gallery example: Use qt_add_qml_module() in CMakeLists.txtOliver Eftevaag2022-11-061-75/+67
| | | | | | | | | | | | | | We want to use qt_add_qml_module() instead of qt_add_resources(). Note that this change also changes the target to 'galleryexample', which will also affect the name of the executable. I'm making that change in order to be consistent with other examples. Task-number: QTBUG-98130 Change-Id: I1ed1af18a01b652673828c60e803cb2ea9b04a3d Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit fa00dee21ccd6f7ec159a8d88756df6e778b8d32) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Fix texteditor example for AndroidTomi Korpipaa2022-10-212-0/+85
| | | | | | | | Fixes: QTBUG-103939 Change-Id: I60237f8cc58ebb6781a4df272fb7da13467d6640 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 51ddad5ffde6f14f8a826ef57e652e56578afd76) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Automotive example: Use qt_add_qml_module()Oliver Eftevaag2022-09-271-158/+115
| | | | | | | | Task-number: QTBUG-98130 Change-Id: I18e45ab63e0cab8611b4274e2d312db12fc9775d Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit fc7854702705ae04f1ffd57685b20e21791b2cb3) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SidePanel example: use qt_add_qml_module() in CMakeLists.txtOliver Eftevaag2022-09-271-25/+17
| | | | | | | | | | | This patch replaces the usage of qt_add_resources() with qt_add_qml_module() Task-number: QTBUG-98130 Change-Id: I31ef1bd0c725fe741c8505fa1620801195e46eeb Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit aaab4e797a728538e23a6695eb3edfef756f2669) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* TextEditor example: use qt_add_qml_module in CMakeLists.txtOliver Eftevaag2022-09-271-22/+19
| | | | | | | | | | Our examples should use qt_add_qml_module when possible. Task-number: QTBUG-98130 Change-Id: I9f5946bf287734aab52c08691d6e38910de0e410 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 316310158bb51edbe813f15742b165b0e69c95ab) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Contactlist example: use qt_add_qml_module() in CMakeLists.txtOliver Eftevaag2022-09-262-25/+16
| | | | | | | | | | | This patch also includes a small change to a signal handler, in order to avoid a warning message. Task-number: QTBUG-98130 Change-Id: I2df71f397a4a8cb43912b90c0c89b297f5463568 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit ec9312687e36ac06faaf4d4cdbd2528cc297a849) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* SwipeToRemove example: use qt_add_qml_module() in CMakeLists.txtOliver Eftevaag2022-09-262-25/+14
| | | | | | | | | | | We want our examples to use qt_add_qml_module(), since it has a lot of advantage over the old method of using qt6_add_resources(). Task-number: QTBUG-98130 Change-Id: I124863e50a9cf201981ea073d5b2096d511271a4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 8d613f693ec8d9ff48f6c82f842206e6b1e9b889) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Musicplayer example: use qt_add_qml_module() in CMakeLists.txtOliver Eftevaag2022-09-261-189/+157
| | | | | | | | Task-number: QTBUG-98130 Change-Id: Ib1eeaf1f837e10eaf88b0e64d792466db8b4f151 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit d9d9b0c3aa4b9674fe177e95220b18a80074891f) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Examples: Fix .pro files for chattutorialBartlomiej Moskal2022-09-166-11/+20
| | | | | | | | | | | | | | | | Chat Tutorial application was not able to find main.qml file when using qmake. It was caused by cmake adaptation for using qt_add_qml_module. The main.qml file is currently searched in the chapter directory. To these changes also qmake configuration must be adapted. Fixes: QTCREATORBUG-27655 Change-Id: I1e92d806dbfeb17e613596f96fd24f53fb6eba1d Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit a9841877f38223ce81692b437d58a0cf07541da1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* todolist example: Make it easier to hide keyboard when finished editingDoris Verria2022-09-142-1/+23
| | | | | | | | | | | | - Hide keyboard on Keys.onReturnPressed event in the TextField-s - Add "Done" button to TextArea to mark editing as finished and hide the keyboard in return Done-with: Mitch Curtis <mitch.curtis@qt.io> Change-Id: I3351e5b3db356946b59b19c6f424153cbf2dbbb1 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit db0716571c17a33809d9c4f53722fbc99656c0a4) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples/texteditor: remove use of Material styleSamuli Piippo2022-09-141-3/+0
| | | | | | | | | | | | Amend ec582ef0b9e31c5e8fb9d36a17f1e39f593d7455 which removed use of Material as the default style. This cause example to fail when cross-compiled, as it then used different qml file which had dependency to Material style. Fixes: QTBUG-106557 Change-Id: I7f918363a47c801a6755eca38c1c4bc4da2854b6 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> (cherry picked from commit a5ced5b63c7fdd2ce83f1fb54c25ae38fbad8246) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Controls: add todolist example for showcasing the iOS StyleJenny Lofthus2022-09-0837-0/+1022
| | | | | | | | Task-number: QTBUG-80261 Change-Id: Ie6d86b0a49bd0684373816d709c7e010aff7e7a5 Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io> (cherry picked from commit 6b5cf5969889a88d5f506692c859d1bd4f59d5dd) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* examples, texteditor: remove the config file, and use default settings insteadRichard Moe Gustavsen2022-08-313-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The qtquickcontrols2.conf file was hard coding the style to be Material. In addition, it was overriding both the Primary and the Foreground color, and sat Theme=System. The latter meant that the application would run in either Light or Dark mode, depending on the OS. And for Dark mode, the assigned colors caused the text to end up with the same color as the background color, and therefore be invisible. The same with the toolbar buttons; since the icon color of a toolbar button map to the primary color, and the primary color was hard-coded to be the same as the background color in the configuration file, the buttons would appear hidden. Since we now have native styles for both macOS and Windows (and Fusion on Linux), overriding the style (and especially the colors) in a config file seems unnecessary. This patch will therefore remove the whole config file, and use the default style settings instead. Fixes: QTBUG-105860 Change-Id: I330fe30746096cf26d8dca343f2c122d7c32c7fe Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io> Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit ec582ef0b9e31c5e8fb9d36a17f1e39f593d7455) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* TextEditor example: use the ColorDialog from qt quick dialogsOliver Eftevaag2022-08-251-10/+20
| | | | | | | | | | | | | | | | | | | | | In 6.4 we're introducing the ColorDialog in the qt quick dialogs module. This was the final dialog, that was missing from the module in previous versions of qt. This change will make use of the new dialog, instead of the qt labs platform version, which is using the widgets color dialog as a fallback. The eventual goal for this example should be to eliminate the need for the qt labs platform module entirely. Note that I am also making a small change to how the font dialog is being used, since we deprecated the currentFont property in the 6.3 release, but I forgot to update this example along with it. Change-Id: Ib99ca7cbf110d3084ff96dfadfa1cd8c8af8815e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit 314cae87524993a2af8068aa81c90ab2f1006590) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Doc: Fix image for eventcalendar exampleBartlomiej Moskal2022-08-251-1/+1
| | | | | | | | | | | Use correct image in documentation for eventcalendar example. Fixes: QTBUG-105572 Change-Id: If217dfa536aea2fa3197510c36a865053e3e96dd Reviewed-by: Nicholas Bennett <nicholas.bennett@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> (cherry picked from commit db11519e68aa819c635d7e893ba9005a05fead42) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* texteditor: fix out-dated code snippetMitch Curtis2022-08-251-1/+1
| | | | | | | | | The property should be selectedFile, not file. Change-Id: I3ce399a7df2d80d122058c411b9b1a633f04fc64 Reviewed-by: Oliver Eftevaag <oliver.eftevaag@qt.io> (cherry picked from commit 2f67fdb949600bc542e69a89b3a70cfe3e9996c6) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
* Use SPDX license identifiersLucie Gérard2022-06-14132-6215/+264
| | | | | | | | | | | | | Replace the current license disclaimer in files by a SPDX-License-Identifier. Files that have to be modified by hand are modified. License files are organized under LICENSES directory. Task-number: QTBUG-67283 Change-Id: I63563bbeb6f60f89d2c99660400dca7fab78a294 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io> (cherry picked from commit 0dc4fd240a2897c5c443a0ef6d84c416843e4938) Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Examples: Replace qt-5 urlsKai Köhne2022-06-052-5/+5
| | | | | | Pick-to: 6.3 Change-Id: Ifec0960bfb3f179e2cf5ff5e7f11364b106a86e3 Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
* Update the text editor to use the MessageDialog in qt quick dialogsOliver Eftevaag2022-05-111-6/+7
| | | | | | | | | | | | Our goal is to eventually remove the dependency for the qt labs platform module. This patch will replace one of the labs platform MessageDialogs, with a MessageDialog from qt quick dialogs. All of the dialogs that are used in this example will eventually be from the qt quick dialogs module. Change-Id: I19f97948bf04d0fa5b265e057bbf49374bb51472 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Merge remote-tracking branch 'origin/dev' into wip/iosstyleMitch Curtis2022-03-311-1/+3
|\ | | | | | | Change-Id: I669b338496d926b5a2fa0f49561dddc0cf349bd0
| * Add cmake support for examplesFabian Kosmale2022-03-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | qml-i18n needed to be ported to CMake first. It uses qt_add_translations introduced in 6.2 As a drive-by, move find_package calls from examples' CML to the top level CML, and make the QtSql dependency optional. Also make sure that we only add the dynamicscene example when the Quick target is available. Pick-to: 6.2 6.3 Fixes: QTBUG-90964 Change-Id: Id357eb14e4704753386e01393300966eb89b4e86 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* | Add directory for new iOS style and initial plugin implementationDoris Verria2022-02-101-0/+3
|/ | | | | Change-Id: I80c8d0406a071e435bc8872aad7478fb75996475 Reviewed-by: Doris Verria <doris.verria@qt.io>
* Improve examples CMakeLists.txtKai Köhne2022-01-2417-151/+73
| | | | | | | | | | | | | | | | | | - Remove # generated from xyz.pro comment from pro2cmake - Remove "# special case" markers for pro2cmake - Remove automatic use of CMAKE_AUTORCC - Only opt into CMAKE_AUTOUIC if .ui files are involved - Remove explicit setting of CMAKE_INCLUDE_CURRENT_DIR - Combine multiple find_package(Qt6 ... calls) - use REQUIRED COMPONENTS - sort components alphabetically - Fix wrong indentations - Use (only) one empty line after multi-line commands Pick-to: 6.3 Change-Id: I0d6bfb06c4b25e9921d3d2bf31d977150f12b31b Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Jörg Bornemann <joerg.bornemann@qt.io>
* Disambiguate "parent" in flatstyle exampleShawn Rutledge2022-01-241-5/+5
| | | | | | | | | | | | | Amends d7862eac1b09f9fb28e540970d5cc98cb6479c52 "rectangle" wasn't a good name for the circular knob part of the switch. By using a more unique name "nub" we can make it a bit easier to read and avoid using "parent" at all. https://en.wiktionary.org/wiki/nub Fixes: QTBUG-100110 Pick-to: 6.3 Change-Id: I428dc6d8463af4ea7e5890145fd40590fed4bcbe Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Switch examples to build as isolated sub-buildsAlexandru Croitor2021-12-162-15/+15
| | | | | | | Pick-to: 6.2 6.3 Task-number: QTBUG-90820 Change-Id: I7fab73f63a22901ab2d4d4e57b5a25b433100de5 Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
* Add .qmlproject file for examples containing .ui.qml filesThomas Hartmann2021-11-181-0/+45
| | | | | | | | | | If an example contains ui.qml it should also have a .qmlproject file for Qt Design Studio. Pick-to: 6.2 Change-Id: I290838f5bf7c6d295ea7fecb6b1c689ad5b924e1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Doc: Fix qdoc warningsVenugopal Shivashankar2021-11-142-2/+2
| | | | | | | | - Comment out \instantiates entries that refer to private C++ classes - Fix clang-format and regexp warnings Change-Id: I7228538715b9d34ab39e7c0f71155be7a277116a Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Fix CMakeLists.txts of chattutorialMitch Curtis2021-11-09110-524/+517
| | | | | | | | | | | | | | | | | | - Run pro2cmake.py on each .pro and did some manual adjustments. - Rename directories to simplify resource paths, URIs, etc. - Rename executables to ensure they're distinguishable from other targets in Creator's locator. - Duplicate images into each example due to issues with resources. - Now that we use qt_add_qml_module, the qtquickcontrols2.conf file will no longer be at the resource root, so specify it separately with qt6_add_resources. - Update qmake files. - Fix documentation. Task-number: QTBUG-98130 Pick-to: 6.2 Change-Id: I210ef2cbcd45dd7f4df881332174bff1b18c5be7 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Add calendar typesMitch Curtis2021-11-0316-0/+984
| | | | | | | | | | | Formerly Qt.labs.calendar, then QtQuick.Calendar in the marketplace, this now returns as part of the controls module. [ChangeLog] Added types from Qt.labs.calendar/QtQuick.Calendar. Change-Id: I8a06c08e6520be1ba8f33c73ba174785724e99c2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Update examples to use new PropertyChangesUlf Hermann2021-11-034-37/+22
| | | | | | | | Also, prefer the multi-line syntax over ';'-separated bindings for readability. Change-Id: I3d6eb854e514ee257ca83773a11e6e9e10770bff Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove deprecated usage of QQmlFileSelector::get in texteditor exampleLuca Di Sera2021-10-221-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | The text editor example adds a "touch" file selector to the qml engine that is used for the application such as to be able to provide an interface for touch based devices. The extra selectors were added by retrieving the engine's file selector trough QQmlFileSelector::get, which was deprecated in Qt 6.0, see commit 75563fa761b94e049de0a29e91591610b0d15745. This resulted in a deprecation warning when the example was built. To avoid the warning and the use of deprecated methods in examples, the example was modified to use the suggested replacement, `QQmlApplicationEngine::setExtraFileSelectors`. A line suggesting the use of the deprecated method was removed from `QQmlFileSelector`'s documentaton page. Fixes: QTBUG-97462 Pick-to: 6.2 Change-Id: I6ee0306647fe16e75c2cd72f3b37be6c7c5f9261 Reviewed-by: Topi Reiniö <topi.reinio@qt.io> Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
* Replace 0 pointer constants with nullptrAllan Sandfeld Jensen2021-10-184-4/+4
| | | | | | | Replaced in most common patterns. Change-Id: Idcaff1f2e915f29922702d3600a2e5f1e2418a7a Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* chattutorial: fix build without SQLMitch Curtis2021-10-151-2/+5
| | | | | | Pick-to: 6.2 Change-Id: I68d1a2c42cde55ed9d370411943c2cb006355186 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Implement horizontal rule rendering in textShawn Rutledge2021-10-141-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | The rule is just a line drawn with the same thickness as an underline: it gets thicker as DPR increases. A horizontal rule can be created via <hr/> in RichText. In markdown it's called a "thematic break," and a line with - - - is one way to create it: https://spec.commonmark.org/0.30/#thematic-breaks <hr width=70/> or <hr width=70%> set the width in pixels, and percent of the text width, respectively; the rule will be centered within the line's bounding box in that case, as in QTextEdit etc. The color can come from QTextFormat::BackgroundBrush if it's set on the QTextBlockFormat, but otherwise falls back to the text color. This can be done with CSS styling: <hr style="background-color:green;"/> [ChangeLog][QtQuick][Text] Horizontal rules (thematic breaks in markdown) are now rendered as simple horizontal lines, either in the same color as the text, or as specified via CSS background-color. Fixes: QTBUG-74342 Task-number: QTBUG-81306 Change-Id: I64f9daf28994225d1a8383d8e2e01e611a0a0237 Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>
* TextEditor: Clean up example and use quick dialogsOliver Eftevaag2021-09-296-222/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The text editor example is dependent on Qt.labs for its dialogs and native menus. The long term goal is to remove the Qt.labs dependency, and replace it with components from QtQuick. Currently we have a file and a font dialog, that should be used instead of the Qt.labs dialogs. I'm also replacing some of the properties in the DocumentHandler, since I don't think it makes sense for the font to be limited to only a few font weights and styles (which can be selected through the font dialog). Selecting the most common font weight and style is still possible using the bold and italic shortcuts and toolbar buttons. Some more features includes: * An additional toolbar button, which can be used to strikeout the selected font. This required adding an additional glyph to fontello.ttf. * When coupled with the fix for QTBUG-96934, the font for the current selection should automatically update the listviews in the font dialog to select the correct family, style, sizes and effects for what is selected in the document handler. Fixes: QTBUG-95976 Pick-to: 6.2 Change-Id: I2907a2270e2a139b1ccb3fcb3ce3a788306a42e3 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Gallery example: remove binding loop from TextArea pageOliver Eftevaag2021-09-131-1/+1
| | | | | | | | | | | | | | | | | | | | The width binding for the TextArea was didn't make a lot of sense. It used to be limited by the panes availableWidth / 3, but if the implicitWidth was less, the text would move towards the center, since the anchors are centering the TextArea horizontally. Setting the width to just always be the panes availableWidth / 3, simplifies the binding, removes the binding loop, and doesn't move the visible text towards the center when the implicitWidth is less than 1/3 of the panes availableWidth. Note that this doesn't directly fix QTBUG-91109, because QTBUG-91109 isn't really a bug to begin with. Pick-to: 6.2 Fixes: QTBUG-91109 Change-Id: I5b6de8dfd11fd726e8ffdae0e46143c448985dc4 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove .prev_CMakeLists.txtUlf Hermann2021-08-312-183/+0
| | | | | | | | We don't need to use pro2cmake anymore here. Pick-to: 6.2 Change-Id: Iba8bac70c1fe31e56bf9680608913cc2c336f946 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Raise cmake_minimum_required to VERSION 3.16 in examplesJoerg Bornemann2021-08-1714-14/+14
| | | | | | | Pick-to: 6.2 Task-number: QTBUG-95636 Change-Id: I9f76b787533dad1c469fbb8c69df6c27b20a9aa3 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Remove deprecation warning from QtQuickControls2 gallery exampleLuca Di Sera2021-08-051-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the "Delegates" page of the gallery example the user is allowed to swipe over the available `SwipeDelegateComponent`s to show a 'remove' button, which allows the removal of that item from the containing list when pressed. When this happens, an animation is played. In the code, the animation was attached to the signal handler, as follows: ``` ListView.onRemove: SequentialAnimation { ... } ``` This form of attachment has been deprecated as of Qt 6.1.0, in commit 6eb35df60e, in favor of creating a stand-alone object and calling the relevant slot from the signal handler, generating a series of warning when the attachment happens during the creation of the page. This patch updates the connection to the new format, avoiding the generation of the warnings. Pick-to: 6.2 6.1 Fixes: QTBUG-95562 Change-Id: Ib67cb9b8703dad427c49475c00791fdd5d1b0669 Reviewed-by: Paul Wicking <paul.wicking@qt.io>
* Use fixed qt_add_resource BASE argumentJoerg Bornemann2021-05-226-441/+297
| | | | | | | | Pick-to: 6.1 Task-number: QTBUG-86726 Change-Id: Ie638443a76623df0ec20fbcd5485af59866deee6 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix gallery example defaulting to Basic instead of the platform defaultMitch Curtis2021-03-242-4/+13
| | | | | | | | | | | | | | The example used to default to the Default style, and when that was renamed to Basic and the default style behavior changed, we forgot to adapt the style property in the QML Settings instance. We should now not set any value as a default, and instead ensure that the style is set on the QSettings in C++. Pick-to: 6.1 6.0 Change-Id: Ia8654f28ae6adc9171d667c2c5c3603a15251cab Fixes: QTBUG-91989 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
* Fix build of some examples on WindowsMitch Curtis2020-12-102-8/+12
| | | | | | | | | | | | | ba2da7d7459a4c64379336435d6091b30ac0d71e fixed the build of some examples when cross-compiling, but for whatever reason it breaks regular builds on Windows. This patch makes that fix more specific in the environments it affects. Fixes: QTBUG-89290 Pick-to: 6.0 Change-Id: I5356a855e3b6f9c27ba05beb9dc11dc32920c6c5 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* CMake: Make QT_BUILD_EXAMPLES build work with boot2qtJoerg Bornemann2020-12-032-0/+8
| | | | | | | | Work around QTBUG-86533 by adding explicit dependencies to QuickTemplates2. Change-Id: I293e6db652cbd6c7a699f778c0d45c6c1fd9bdc9 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
* Fix documentation links to High DPI documentationAndreas Buhr2020-12-011-1/+1
| | | | | | | | | | | The documentation on High DPI was recently rewritten, renaming several sections. This patch fixes the links which were broken by this change. Task-number: QTBUG-88533 Pick-to: 6.0 Change-Id: Iae9f38d722a267ba5b21db6f2ef7394a6c675d4f Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
* gallery: don't store QQuickStyle::name() in settings on startupMitch Curtis2020-11-301-5/+7
| | | | | | | | | | | | | | It's no longer empty if not specified, so just skip that step altogether. Add the desktop styles to the list of selectable styles, but only on the correct platforms. Only set the style at startup if it wasn't specified via QT_QUICK_CONTROLS_STYLE. I tried to detect if a -style application argument was passed, but it doesn't show up in the list of arguments. Change-Id: I7c216372580a012693b7a01d138d79c8d46afe66 Fixes: QTBUG-88955 Pick-to: 6.0 6.0.0 Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@qt.io>
* Doc: Drop the \excludefromcreator meta tagVenugopal Shivashankar2020-11-241-3/+0
| | | | | | | | | The example does not depend on the Qt Graphical Effects module now. Pick-to: 6.0 6.0.0 Change-Id: Ia69bc16738f5f52aaea828409ef73bf0c68e371e Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
* Remove glow effects from automotive exampleMitch Curtis2020-11-195-86/+13
| | | | | | | | | For now there is no way to do this without writing them ourselves. Since the effect was fairly subtle, we simply live without it for now. Task-number: QTBUG-88202 Change-Id: Ic2556258461f657eddef3a597d928a7a0a7604c4 Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
* Example: Drop "2" against "Qt Quick Controls" textVenugopal Shivashankar2020-11-175-10/+9
| | | | | | | | | | | | | This should ensure that the examples give the same message as the documentation. In addition, dropped a phrase about Qt Quick Controls claiming that it is designed for mobile and embedded. The latest version of controls covers the entire spectrum. Change-Id: Ia856fa47a6e6fc35f80bedc549378a00c7fbbc2a Pick-to: 5.15 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io> Reviewed-by: Topi Reiniö <topi.reinio@qt.io>
* Doc: use correct casing for Material style nameMitch Curtis2020-11-091-3/+3
| | | | | Change-Id: Ia2d10b9fd27c8e83bfd8ed8ae021391ba1df50f1 Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 10:18:06 +0000