Commit 278139c5 by Shawn Rutledge Committed by The Qt Project

move quick dialogs example into an artificial subdirectory again

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: 's avatarTopi Reiniö <topi.reinio@digia.com>
Reviewed-by: 's avatarCaroline Chao <caroline.chao@digia.com>
parent 5ce41d1e
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
......@@ -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.
*/
......@@ -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)
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
<RCC>
<qresource prefix="/dialogs">
<file>dialogs.qml</file>
<file>systemdialogs.qml</file>
<file>FileDialogs.qml</file>
<file>ColorDialogs.qml</file>
</qresource>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment