diff options
Diffstat (limited to 'examples')
14 files changed, 93 insertions, 20 deletions
diff --git a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc index a26ce20b..f7cbd32f 100644 --- a/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc +++ b/examples/quickcontrols2/chattutorial/doc/src/qtquickcontrols2-chattutorial.qdoc @@ -28,7 +28,8 @@ /*! \example chattutorial \keyword Qt Quick Controls - Chat Tutorial - \title Qt Quick Controls 2 - Chat Tutorial + \title Qt Quick Controls - Chat Tutorial + \keyword 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 110f398f..2c692430 100644 --- a/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc +++ b/examples/quickcontrols2/contactlist/doc/src/qtquickcontrols2-contactlist.qdoc @@ -27,7 +27,8 @@ /*! \example contactlist \keyword Qt Quick Controls - Contact List - \title Qt Quick Controls 2 - Contact List + \title Qt Quick Controls - Contact List + \keyword Qt Quick Controls 2 - Contact List \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a C++ class that implements a simple contact list. diff --git a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc index c123b27e..a71c2093 100644 --- a/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc +++ b/examples/quickcontrols2/flatstyle/doc/src/qtquickcontrols2-flatstyle.qdoc @@ -28,7 +28,8 @@ /*! \example flatstyle \keyword Qt Quick Controls - Flat Style - \title Qt Quick Controls 2 - Flat Style + \title Qt Quick Controls - Flat Style + \keyword Qt Quick Controls 2 - Flat Style \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a QML plugin with customized controls. 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 560acf52..463acdee 100644 --- a/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc +++ b/examples/quickcontrols2/gallery/doc/src/qtquickcontrols2-gallery.qdoc @@ -28,7 +28,8 @@ /*! \example gallery \keyword Qt Quick Controls - Gallery - \title Qt Quick Controls 2 - Gallery + \title Qt Quick Controls - Gallery + \keyword 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 6e293450..4e3d3352 100644 --- a/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc +++ b/examples/quickcontrols2/imagine/automotive/doc/src/qtquickcontrols2-automotive.qdoc @@ -28,7 +28,8 @@ /*! \example imagine/automotive \keyword Qt Quick Controls - Imagine Style Example: Automotive - \title Qt Quick Controls 2 - Imagine Style Example: Automotive + \title Qt Quick Controls - Imagine Style Example: Automotive + \keyword 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 f6c2189f..28d298e7 100644 --- a/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc +++ b/examples/quickcontrols2/imagine/musicplayer/doc/src/qtquickcontrols2-musicplayer.qdoc @@ -28,7 +28,8 @@ /*! \example imagine/musicplayer \keyword Qt Quick Controls - Imagine Style Example: Music Player - \title Qt Quick Controls 2 - Imagine Style Example: Music Player + \title Qt Quick Controls - Imagine Style Example: Music Player + \keyword 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 a7d0828e..49e997fb 100644 --- a/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc +++ b/examples/quickcontrols2/sidepanel/doc/src/qtquickcontrols2-sidepanel.qdoc @@ -28,7 +28,8 @@ /*! \example sidepanel \keyword Qt Quick Controls - Side Panel - \title Qt Quick Controls 2 - Side Panel + \title Qt Quick Controls - Side Panel + \keyword 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 9fd05261..c359a423 100644 --- a/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc +++ b/examples/quickcontrols2/swipetoremove/doc/src/qtquickcontrols2-swipetoremove.qdoc @@ -28,7 +28,8 @@ /*! \example swipetoremove \keyword Qt Quick Controls - Swipe to Remove - \title Qt Quick Controls 2 - Swipe to Remove + \title Qt Quick Controls - Swipe to Remove + \keyword 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 6ba64b34..3e9a9268 100644 --- a/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc +++ b/examples/quickcontrols2/texteditor/doc/src/qtquickcontrols2-texteditor.qdoc @@ -27,7 +27,8 @@ /*! \example texteditor \keyword Qt Quick Controls - Text Editor - \title Qt Quick Controls 2 - Text Editor + \title Qt Quick Controls - Text Editor + \keyword Qt Quick Controls 2 - Text Editor \ingroup qtquickcontrols2-examples \brief A QML app using Qt Quick Controls 2 and a C++ class to provide a fully-functional rich-text editor application. diff --git a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc index fae719f8..95e8329d 100644 --- a/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc +++ b/examples/quickcontrols2/wearable/doc/src/qtquickcontrols2-wearable.qdoc @@ -28,7 +28,8 @@ /*! \example wearable \keyword Qt Quick Controls - Wearable Demo - \title Qt Quick Controls 2 - Wearable Demo + \title Qt Quick Controls - Wearable Demo + \keyword Qt Quick Controls 2 - Wearable Demo \ingroup qtquickcontrols2-examples \brief Demonstrates an application launcher designed for wearable devices. |