summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@digia.com>2013-06-11 14:44:10 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-06-12 16:33:37 +0200
commit278139c5d7bfa338ff75c5225077976ece7490e0 (patch)
tree3195604fe89e0c86edc0d928a18a9a7d9bee7e1e
parent5ce41d1e77db3f46c396834f698826f4fd998344 (diff)
move quick dialogs example into an artificial subdirectory againv5.1.0-rc1
The trouble with Id28d5718b4b7b475dcd7d62e31c4634219dc3ddc is that the build assumes that all example directories are subdirectories, so the examples-manifest.xml will point to the wrong place and creator ends up not having the example on the welcome page. That's more rigid than it should be, but we might as well use the opportunity to distinguish system dialogs from any QML-only dialogs that might be added to this module later on. Change-Id: I6e7261e096d75df560c6ce608af4c54b82e52d13 Reviewed-by: Topi Reiniƶ <topi.reinio@digia.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
-rw-r--r--examples/quick/dialogs/dialogs.pro19
-rw-r--r--examples/quick/dialogs/systemdialogs/ColorDialogs.qml (renamed from examples/quick/dialogs/ColorDialogs.qml)0
-rw-r--r--examples/quick/dialogs/systemdialogs/FileDialogs.qml (renamed from examples/quick/dialogs/FileDialogs.qml)0
-rw-r--r--examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg (renamed from examples/quick/dialogs/doc/images/dialogs-example.jpg)bin47413 -> 47413 bytes
-rw-r--r--examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc (renamed from examples/quick/dialogs/doc/src/dialogs.qdoc)16
-rw-r--r--examples/quick/dialogs/systemdialogs/main.cpp (renamed from examples/quick/dialogs/main.cpp)4
-rw-r--r--examples/quick/dialogs/systemdialogs/systemdialogs.pro17
-rw-r--r--examples/quick/dialogs/systemdialogs/systemdialogs.qml (renamed from examples/quick/dialogs/dialogs.qml)0
-rw-r--r--examples/quick/dialogs/systemdialogs/systemdialogs.qrc (renamed from examples/quick/dialogs/dialogs.qrc)2
9 files changed, 33 insertions, 25 deletions
diff --git a/examples/quick/dialogs/dialogs.pro b/examples/quick/dialogs/dialogs.pro
index b76f396e9d..538e75686c 100644
--- a/examples/quick/dialogs/dialogs.pro
+++ b/examples/quick/dialogs/dialogs.pro
@@ -1,17 +1,4 @@
-TEMPLATE = app
+TEMPLATE = subdirs
-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
+SUBDIRS = \
+ systemdialogs
diff --git a/examples/quick/dialogs/ColorDialogs.qml b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
index 6a0af7f730..6a0af7f730 100644
--- a/examples/quick/dialogs/ColorDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/ColorDialogs.qml
diff --git a/examples/quick/dialogs/FileDialogs.qml b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
index d1278609f9..d1278609f9 100644
--- a/examples/quick/dialogs/FileDialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/FileDialogs.qml
diff --git a/examples/quick/dialogs/doc/images/dialogs-example.jpg b/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg
index 4517a39308..4517a39308 100644
--- a/examples/quick/dialogs/doc/images/dialogs-example.jpg
+++ b/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg
Binary files differ
diff --git a/examples/quick/dialogs/doc/src/dialogs.qdoc b/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc
index daac914c60..9788be7343 100644
--- a/examples/quick/dialogs/doc/src/dialogs.qdoc
+++ b/examples/quick/dialogs/systemdialogs/doc/src/systemdialogs.qdoc
@@ -25,10 +25,10 @@
**
****************************************************************************/
/*!
- \title Qt Quick Dialog Examples
- \example dialogs
- \brief This example demonstrates the dialog types in QML
- \image dialogs-example.jpg
+ \title Qt Quick System Dialog Examples
+ \example systemdialogs
+ \brief This example demonstrates the system dialog types in QML
+ \image systemdialogs-example.jpg
\ingroup qtquickdialog_examples
This example demonstrates the system dialogs in the \l{Qt Quick Dialogs}
@@ -36,9 +36,13 @@
A \l FileDialog is used to choose a single file, multiple files or a
single directory, depending on how it is configured.
- \snippet dialogs/FileDialogs.qml filedialog
+ \snippet systemdialogs/FileDialogs.qml filedialog
A \l ColorDialog is used to choose a color, with or without alpha (transparency)
depending on how it is configured.
- \snippet dialogs/ColorDialogs.qml colordialog
+ \snippet systemdialogs/ColorDialogs.qml colordialog
+
+ The example can be built as a standalone executable, but each
+ type of dialog is demonstrated in a separate QML file which can
+ also be run separately with qmlscene.
*/
diff --git a/examples/quick/dialogs/main.cpp b/examples/quick/dialogs/systemdialogs/main.cpp
index bbf0c48104..2119227c1f 100644
--- a/examples/quick/dialogs/main.cpp
+++ b/examples/quick/dialogs/systemdialogs/main.cpp
@@ -37,5 +37,5 @@
** $QT_END_LICENSE$
**
****************************************************************************/
-#include "../shared/shared.h"
-DECLARATIVE_EXAMPLE_MAIN(dialogs/dialogs)
+#include "../../shared/shared.h"
+DECLARATIVE_EXAMPLE_MAIN(dialogs/systemdialogs)
diff --git a/examples/quick/dialogs/systemdialogs/systemdialogs.pro b/examples/quick/dialogs/systemdialogs/systemdialogs.pro
new file mode 100644
index 0000000000..e8c3e9857b
--- /dev/null
+++ b/examples/quick/dialogs/systemdialogs/systemdialogs.pro
@@ -0,0 +1,17 @@
+TEMPLATE = app
+
+QT += quick qml
+SOURCES += main.cpp
+RESOURCES += systemdialogs.qrc ../../shared/shared.qrc
+
+OTHER_FILES += \
+ systemdialogs.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.qml b/examples/quick/dialogs/systemdialogs/systemdialogs.qml
index b5f9841a3f..b5f9841a3f 100644
--- a/examples/quick/dialogs/dialogs.qml
+++ b/examples/quick/dialogs/systemdialogs/systemdialogs.qml
diff --git a/examples/quick/dialogs/dialogs.qrc b/examples/quick/dialogs/systemdialogs/systemdialogs.qrc
index efebfe4845..b90b99f7f5 100644
--- a/examples/quick/dialogs/dialogs.qrc
+++ b/examples/quick/dialogs/systemdialogs/systemdialogs.qrc
@@ -1,6 +1,6 @@
<RCC>
<qresource prefix="/dialogs">
- <file>dialogs.qml</file>
+ <file>systemdialogs.qml</file>
<file>FileDialogs.qml</file>
<file>ColorDialogs.qml</file>
</qresource>