diff options
Diffstat (limited to 'examples')
-rw-r--r-- | examples/quick/dialogs/ColorDialogs.qml (renamed from examples/quick/dialogs/colorandfiledialogs/ColorDialogs.qml) | 0 | ||||
-rw-r--r-- | examples/quick/dialogs/FileDialogs.qml (renamed from examples/quick/dialogs/colorandfiledialogs/FileDialogs.qml) | 0 | ||||
-rw-r--r-- | examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.pro | 17 | ||||
-rw-r--r-- | examples/quick/dialogs/dialogs.pro | 19 | ||||
-rw-r--r-- | examples/quick/dialogs/dialogs.qml (renamed from examples/quick/dialogs/colorandfiledialogs/dialogs.qml) | 0 | ||||
-rw-r--r-- | examples/quick/dialogs/dialogs.qrc (renamed from examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.qrc) | 0 | ||||
-rw-r--r-- | examples/quick/dialogs/doc/images/dialogs-example.jpg (renamed from examples/quick/dialogs/colorandfiledialogs/doc/images/qml-colorandfiledialogs-example.jpg) | bin | 47413 -> 47413 bytes | |||
-rw-r--r-- | examples/quick/dialogs/doc/src/dialogs.qdoc (renamed from examples/quick/dialogs/colorandfiledialogs/doc/src/colorandfiledialogs.qdoc) | 14 | ||||
-rw-r--r-- | examples/quick/dialogs/main.cpp (renamed from examples/quick/dialogs/colorandfiledialogs/main.cpp) | 2 |
9 files changed, 24 insertions, 28 deletions
diff --git a/examples/quick/dialogs/colorandfiledialogs/ColorDialogs.qml b/examples/quick/dialogs/ColorDialogs.qml index 6a0af7f730..6a0af7f730 100644 --- a/examples/quick/dialogs/colorandfiledialogs/ColorDialogs.qml +++ b/examples/quick/dialogs/ColorDialogs.qml diff --git a/examples/quick/dialogs/colorandfiledialogs/FileDialogs.qml b/examples/quick/dialogs/FileDialogs.qml index d1278609f9..d1278609f9 100644 --- a/examples/quick/dialogs/colorandfiledialogs/FileDialogs.qml +++ b/examples/quick/dialogs/FileDialogs.qml diff --git a/examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.pro b/examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.pro deleted file mode 100644 index 3a7b25c91a..0000000000 --- a/examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.pro +++ /dev/null @@ -1,17 +0,0 @@ -TEMPLATE = app - -QT += quick qml -SOURCES += main.cpp -RESOURCES += colorandfiledialogs.qrc ../../shared/shared.qrc - -OTHER_FILES += \ - dialogs.qml \ - FileDialogs.qml \ - ColorDialogs.qml - -EXAMPLE_FILES = \ - FileDialogs.qml \ - ColorDialogs.qml - -target.path = $$[QT_INSTALL_EXAMPLES]/quick/dialogs -INSTALLS += target diff --git a/examples/quick/dialogs/dialogs.pro b/examples/quick/dialogs/dialogs.pro index 275e36470f..b76f396e9d 100644 --- a/examples/quick/dialogs/dialogs.pro +++ b/examples/quick/dialogs/dialogs.pro @@ -1,4 +1,17 @@ -TEMPLATE = subdirs +TEMPLATE = app -SUBDIRS = \ - colorandfiledialogs +QT += quick qml +SOURCES += main.cpp +RESOURCES += dialogs.qrc ../shared/shared.qrc + +OTHER_FILES += \ + dialogs.qml \ + FileDialogs.qml \ + ColorDialogs.qml + +EXAMPLE_FILES = \ + FileDialogs.qml \ + ColorDialogs.qml + +target.path = $$[QT_INSTALL_EXAMPLES]/quick/dialogs +INSTALLS += target diff --git a/examples/quick/dialogs/colorandfiledialogs/dialogs.qml b/examples/quick/dialogs/dialogs.qml index b5f9841a3f..b5f9841a3f 100644 --- a/examples/quick/dialogs/colorandfiledialogs/dialogs.qml +++ b/examples/quick/dialogs/dialogs.qml diff --git a/examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.qrc b/examples/quick/dialogs/dialogs.qrc index efebfe4845..efebfe4845 100644 --- a/examples/quick/dialogs/colorandfiledialogs/colorandfiledialogs.qrc +++ b/examples/quick/dialogs/dialogs.qrc diff --git a/examples/quick/dialogs/colorandfiledialogs/doc/images/qml-colorandfiledialogs-example.jpg b/examples/quick/dialogs/doc/images/dialogs-example.jpg Binary files differindex 4517a39308..4517a39308 100644 --- a/examples/quick/dialogs/colorandfiledialogs/doc/images/qml-colorandfiledialogs-example.jpg +++ b/examples/quick/dialogs/doc/images/dialogs-example.jpg diff --git a/examples/quick/dialogs/colorandfiledialogs/doc/src/colorandfiledialogs.qdoc b/examples/quick/dialogs/doc/src/dialogs.qdoc index 68804649a9..daac914c60 100644 --- a/examples/quick/dialogs/colorandfiledialogs/doc/src/colorandfiledialogs.qdoc +++ b/examples/quick/dialogs/doc/src/dialogs.qdoc @@ -25,20 +25,20 @@ ** ****************************************************************************/ /*! - \title Qt Quick ColorDialog and FileDialog Examples - \example colorandfiledialogs - \brief This example demonstrates the color and file dialog types in QML - \image qml-colorandfiledialogs-example.jpg + \title Qt Quick Dialog Examples + \example dialogs + \brief This example demonstrates the dialog types in QML + \image dialogs-example.jpg \ingroup qtquickdialog_examples - This example demonstrates the color and file system dialogs in the \l{Qt Quick Dialogs} + This example demonstrates the system dialogs in the \l{Qt Quick Dialogs} module. The appearance and behavior is platform-dependent. A \l FileDialog is used to choose a single file, multiple files or a single directory, depending on how it is configured. - \snippet colorandfiledialogs/FileDialogs.qml filedialog + \snippet dialogs/FileDialogs.qml filedialog A \l ColorDialog is used to choose a color, with or without alpha (transparency) depending on how it is configured. - \snippet colorandfiledialogs/ColorDialogs.qml colordialog + \snippet dialogs/ColorDialogs.qml colordialog */ diff --git a/examples/quick/dialogs/colorandfiledialogs/main.cpp b/examples/quick/dialogs/main.cpp index e8c2ae6aaa..bbf0c48104 100644 --- a/examples/quick/dialogs/colorandfiledialogs/main.cpp +++ b/examples/quick/dialogs/main.cpp @@ -37,5 +37,5 @@ ** $QT_END_LICENSE$ ** ****************************************************************************/ -#include "../../shared/shared.h" +#include "../shared/shared.h" DECLARATIVE_EXAMPLE_MAIN(dialogs/dialogs) |