diff options
16 files changed, 49 insertions, 35 deletions
diff --git a/examples/quick/demos/photosurface/photosurface.qml b/examples/quick/demos/photosurface/photosurface.qml index 53e0edffbe..4f7100358f 100644 --- a/examples/quick/demos/photosurface/photosurface.qml +++ b/examples/quick/demos/photosurface/photosurface.qml @@ -39,13 +39,14 @@ ****************************************************************************/ import QtQuick 2.0 import QtQuick.Dialogs 1.0 +import QtQuick.Window 2.1 import Qt.labs.folderlistmodel 1.0 -Rectangle { +Window { id: root + visible: true width: 1024; height: 600 color: "black" - visible: true property int highestZ: 0 property real defaultSize: 200 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 Binary files differindex 4517a39308..4517a39308 100644 --- a/examples/quick/dialogs/doc/images/dialogs-example.jpg +++ b/examples/quick/dialogs/systemdialogs/doc/images/systemdialogs-example.jpg 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> diff --git a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc index 4fda13746a..ea94a4bc39 100644 --- a/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc +++ b/examples/quick/particles/imageparticle/doc/src/imageparticle.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \title Qt Quick Particles Examples - Affectors + \title Qt Quick Particles Examples - Image Particles \example particles/imageparticle \brief This is a collection of examples using Affectors in the QML particle system. \image qml-imageparticle-example.png diff --git a/examples/quick/particles/system/doc/src/system.qdoc b/examples/quick/particles/system/doc/src/system.qdoc index 99be23d9d1..385cd927da 100644 --- a/examples/quick/particles/system/doc/src/system.qdoc +++ b/examples/quick/particles/system/doc/src/system.qdoc @@ -26,7 +26,7 @@ ****************************************************************************/ /*! - \title Qt Quick Particles Examples - Affectors + \title Qt Quick Particles Examples - System \example particles/system \brief This is a collection of examples using Affectors in the QML particle system. \image qml-system-example.png diff --git a/src/imports/widgets/qquickqcolordialog.cpp b/src/imports/widgets/qquickqcolordialog.cpp index abe6ffd004..d10eacee60 100644 --- a/src/imports/widgets/qquickqcolordialog.cpp +++ b/src/imports/widgets/qquickqcolordialog.cpp @@ -68,8 +68,11 @@ public: virtual void exec() { m_dialog.exec(); } virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) { - m_dialog.windowHandle()->setTransientParent(parent); - m_dialog.windowHandle()->setFlags(f); + m_dialog.winId(); + QWindow *window = m_dialog.windowHandle(); + Q_ASSERT(window); + window->setTransientParent(parent); + window->setFlags(f); m_dialog.setWindowModality(m); m_dialog.setWindowTitle(QPlatformColorDialogHelper::options()->windowTitle()); m_dialog.setOptions((QColorDialog::ColorDialogOptions)((int)(QPlatformColorDialogHelper::options()->options()))); diff --git a/src/imports/widgets/qquickqfiledialog.cpp b/src/imports/widgets/qquickqfiledialog.cpp index 672c6d1bf4..afb150b509 100644 --- a/src/imports/widgets/qquickqfiledialog.cpp +++ b/src/imports/widgets/qquickqfiledialog.cpp @@ -96,8 +96,11 @@ public: virtual void exec() { m_dialog.exec(); } virtual bool show(Qt::WindowFlags f, Qt::WindowModality m, QWindow *parent) { - m_dialog.windowHandle()->setTransientParent(parent); - m_dialog.windowHandle()->setFlags(f); + m_dialog.winId(); + QWindow *window = m_dialog.windowHandle(); + Q_ASSERT(window); + window->setTransientParent(parent); + window->setFlags(f); m_dialog.setWindowModality(m); m_dialog.show(); return m_dialog.isVisible(); diff --git a/tests/auto/quick/examples/tst_examples.cpp b/tests/auto/quick/examples/tst_examples.cpp index 9c5fb88af2..7ef07e4896 100644 --- a/tests/auto/quick/examples/tst_examples.cpp +++ b/tests/auto/quick/examples/tst_examples.cpp @@ -89,6 +89,7 @@ tst_examples::tst_examples() // Add files to exclude here excludedFiles << "examples/quick/canvas/tiger/tiger.qml"; // QTBUG-26528 excludedFiles << "snippets/qml/listmodel/listmodel.qml"; //Just a ListModel, no root QQuickItem + excludedFiles << "examples/quick/demos/photosurface/photosurface.qml"; // root item is Window rather than Item // Add directories you want excluded here (don't add examples/, because they install to examples/qtdeclarative/) excludedDirs << "shared"; //Not an example diff --git a/tests/auto/quick/touchmouse/touchmouse.pro b/tests/auto/quick/touchmouse/touchmouse.pro index bba0abdc17..378e199bf5 100644 --- a/tests/auto/quick/touchmouse/touchmouse.pro +++ b/tests/auto/quick/touchmouse/touchmouse.pro @@ -13,8 +13,6 @@ TESTDATA = data/* # OTHER_FILES += data/foo.qml -CONFIG += parallel_test - DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 mac:CONFIG+=insignificant_test # QTBUG-27890 |
