aboutsummaryrefslogtreecommitdiffstats
path: root/examples/quickcontrols2
diff options
context:
space:
mode:
Diffstat (limited to 'examples/quickcontrols2')
-rw-r--r--examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc3
-rw-r--r--examples/quickcontrols2/contactlist/contactlist.pro8
-rw-r--r--examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc1
-rw-r--r--examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc1
-rw-r--r--examples/quickcontrols2/flatstyle/flatstyle.pro12
-rw-r--r--examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc1
-rw-r--r--examples/quickcontrols2/gallery/gallery.pro54
-rw-r--r--examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc1
-rw-r--r--examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc1
-rw-r--r--examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc1
-rw-r--r--examples/quickcontrols2/sidepanel/sidepanel.pro9
-rw-r--r--examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc1
-rw-r--r--examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc1
-rw-r--r--examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc1
14 files changed, 84 insertions, 11 deletions
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
index 519d1c7a..aea27d94 100644
--- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
+++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc
@@ -27,7 +27,8 @@
/*!
\example chattutorial
-\title Qt Quick Controls 2 - Chat Tutorial
+\keyword Qt Quick Controls - Chat Tutorial
+ \title Qt Quick Controls 2 - Chat Tutorial
\brief Tutorial about writing a basic chat client using Qt Quick Controls 2.
\ingroup qtquickcontrols2-examples
diff --git a/examples/quickcontrols2/contactlist/contactlist.pro b/examples/quickcontrols2/contactlist/contactlist.pro
index 9025dbde..101db15a 100644
--- a/examples/quickcontrols2/contactlist/contactlist.pro
+++ b/examples/quickcontrols2/contactlist/contactlist.pro
@@ -10,7 +10,13 @@ SOURCES += \
contactmodel.cpp
RESOURCES += \
- $$files(*.qml)
+ ContactDelegate.ui.qml \
+ ContactDialog.qml \
+ ContactForm.ui.qml \
+ contactlist.qml \
+ ContactView.ui.qml \
+ designer/Backend/ContactModel.qml \
+ SectionDelegate.ui.qml
# Additional import path used to resolve QML modules just for Qt Quick Designer
QML_DESIGNER_IMPORT_PATH = $$PWD/designer
diff --git a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
index 069b6981..110f398f 100644
--- a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
+++ b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc
@@ -26,6 +26,7 @@
****************************************************************************/
/*!
\example contactlist
+ \keyword Qt Quick Controls - Contact List
\title Qt Quick Controls 2 - Contact List
\ingroup qtquickcontrols2-examples
\brief A QML app using Qt Quick Controls 2 and a C++ class that implements
diff --git a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
index 55c1e8c5..c123b27e 100644
--- a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
+++ b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc
@@ -27,6 +27,7 @@
/*!
\example flatstyle
+ \keyword Qt Quick Controls - Flat Style
\title Qt Quick Controls 2 - Flat Style
\ingroup qtquickcontrols2-examples
\brief A QML app using Qt Quick Controls 2 and a QML plugin
diff --git a/examples/quickcontrols2/flatstyle/flatstyle.pro b/examples/quickcontrols2/flatstyle/flatstyle.pro
index a8ca01bf..fe9e42a8 100644
--- a/examples/quickcontrols2/flatstyle/flatstyle.pro
+++ b/examples/quickcontrols2/flatstyle/flatstyle.pro
@@ -6,10 +6,14 @@ QT += quick quickcontrols2 widgets
SOURCES += main.cpp
RESOURCES += \
- qtquickcontrols2.conf \
- $$files(*.qml) \
- $$files(imports/Theme/*) \
- $$files(Flat/*.qml)
+ qtquickcontrols2.conf \
+ flatstyle.qml \
+ MainForm.ui.qml \
+ Flat/Button.qml \
+ Flat/CheckBox.qml \
+ Flat/Switch.qml \
+ imports/Theme/Theme.qml \
+ imports/Theme/qmldir
# Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH = $$PWD/imports
diff --git a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
index b96ba282..560acf52 100644
--- a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
+++ b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc
@@ -27,6 +27,7 @@
/*!
\example gallery
+ \keyword Qt Quick Controls - Gallery
\title Qt Quick Controls 2 - Gallery
\ingroup qtquickcontrols2-examples
\brief A gallery of controls.
diff --git a/examples/quickcontrols2/gallery/gallery.pro b/examples/quickcontrols2/gallery/gallery.pro
index 705eeae0..2b898fca 100644
--- a/examples/quickcontrols2/gallery/gallery.pro
+++ b/examples/quickcontrols2/gallery/gallery.pro
@@ -7,11 +7,59 @@ SOURCES += \
RESOURCES += \
gallery.qml \
+ pages/BusyIndicatorPage.qml \
+ pages/ButtonPage.qml \
+ pages/CheckBoxPage.qml \
+ pages/ComboBoxPage.qml \
+ pages/DelayButtonPage.qml \
+ pages/DelegatePage.qml \
+ pages/DialogPage.qml \
+ pages/DialPage.qml \
+ pages/FramePage.qml \
+ pages/GroupBoxPage.qml \
+ pages/PageIndicatorPage.qml \
+ pages/ProgressBarPage.qml \
+ pages/RadioButtonPage.qml \
+ pages/RangeSliderPage.qml \
+ pages/ScrollablePage.qml \
+ pages/ScrollBarPage.qml \
+ pages/ScrollIndicatorPage.qml \
+ pages/SliderPage.qml \
+ pages/SpinBoxPage.qml \
+ pages/StackViewPage.qml \
+ pages/SwipeViewPage.qml \
+ pages/SwitchPage.qml \
+ pages/TabBarPage.qml \
+ pages/TextAreaPage.qml \
+ pages/TextFieldPage.qml \
+ pages/ToolTipPage.qml \
+ pages/TumblerPage.qml \
qtquickcontrols2.conf \
icons/gallery/index.theme \
- $$files(icons/*.png, true) \
- $$files(images/*.png) \
- $$files(pages/*.qml)
+ icons/gallery/20x20/back.png \
+ icons/gallery/20x20/drawer.png \
+ icons/gallery/20x20/menu.png \
+ icons/gallery/20x20@2/back.png \
+ icons/gallery/20x20@2/drawer.png \
+ icons/gallery/20x20@2/menu.png \
+ icons/gallery/20x20@3/back.png \
+ icons/gallery/20x20@3/drawer.png \
+ icons/gallery/20x20@3/menu.png \
+ icons/gallery/20x20@4/back.png \
+ icons/gallery/20x20@4/drawer.png \
+ icons/gallery/20x20@4/menu.png \
+ images/arrow.png \
+ images/arrow@2x.png \
+ images/arrow@3x.png \
+ images/arrow@4x.png \
+ images/arrows.png \
+ images/arrows@2x.png \
+ images/arrows@3x.png \
+ images/arrows@4x.png \
+ images/qt-logo.png \
+ images/qt-logo@2x.png \
+ images/qt-logo@3x.png \
+ images/qt-logo@4x.png
target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/gallery
INSTALLS += target
diff --git a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc
index 9a8c1883..6e293450 100644
--- a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc
+++ b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc
@@ -27,6 +27,7 @@
/*!
\example imagine/automotive
+ \keyword Qt Quick Controls - Imagine Style Example: Automotive
\title Qt Quick Controls 2 - Imagine Style Example: Automotive
\ingroup qtquickcontrols2-examples
\brief An automotive user interface using custom Imagine style assets.
diff --git a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc
index 960c683d..f6c2189f 100644
--- a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc
+++ b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc
@@ -27,6 +27,7 @@
/*!
\example imagine/musicplayer
+ \keyword Qt Quick Controls - Imagine Style Example: Music Player
\title Qt Quick Controls 2 - Imagine Style Example: Music Player
\ingroup qtquickcontrols2-examples
\brief An audio player user interface using custom Imagine style assets.
diff --git a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc b/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc
index bc630bb8..a7d0828e 100644
--- a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc
+++ b/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc
@@ -27,6 +27,7 @@
/*!
\example sidepanel
+ \keyword Qt Quick Controls - Side Panel
\title Qt Quick Controls 2 - Side Panel
\ingroup qtquickcontrols2-examples
\brief A persistent side panel with Drawer.
diff --git a/examples/quickcontrols2/sidepanel/sidepanel.pro b/examples/quickcontrols2/sidepanel/sidepanel.pro
index e2fc4aff..1fddc70a 100644
--- a/examples/quickcontrols2/sidepanel/sidepanel.pro
+++ b/examples/quickcontrols2/sidepanel/sidepanel.pro
@@ -6,8 +6,13 @@ SOURCES += \
sidepanel.cpp
RESOURCES += \
- sidepanel.qml \
- $$files(images/*.png)
+ doc/images/qtquickcontrols2-sidepanel-landscape.png \
+ doc/images/qtquickcontrols2-sidepanel-portrait.png \
+ images/qt-logo@2x.png \
+ images/qt-logo@3x.png \
+ images/qt-logo@4x.png \
+ images/qt-logo.png \
+ sidepanel.qml
target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/sidepanel
INSTALLS += target
diff --git a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc b/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc
index 476667bb..9fd05261 100644
--- a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc
+++ b/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc
@@ -27,6 +27,7 @@
/*!
\example swipetoremove
+ \keyword Qt Quick Controls - Swipe to Remove
\title Qt Quick Controls 2 - Swipe to Remove
\ingroup qtquickcontrols2-examples
\brief Demonstrates removal of list items by swipe gesture.
diff --git a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
index a9406f23..6ba64b34 100644
--- a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
+++ b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc
@@ -26,6 +26,7 @@
****************************************************************************/
/*!
\example texteditor
+ \keyword Qt Quick Controls - Text Editor
\title Qt Quick Controls 2 - Text Editor
\ingroup qtquickcontrols2-examples
\brief A QML app using Qt Quick Controls 2 and a C++ class to
diff --git a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
index 124984c1..fae719f8 100644
--- a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
+++ b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc
@@ -27,6 +27,7 @@
/*!
\example wearable
+ \keyword Qt Quick Controls - Wearable Demo
\title Qt Quick Controls 2 - Wearable Demo
\ingroup qtquickcontrols2-examples
\brief Demonstrates an application launcher designed for wearable devices.