diff options
| author | Shawn Rutledge <shawn.rutledge@digia.com> | 2013-06-13 17:02:36 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-06-14 14:20:52 +0200 |
| commit | 9f661cf327bc638d7584ba3832adaaa3d7c8734e (patch) | |
| tree | 7f4899bd40d290e23d0aa61b27771ed2536ccd0a | |
| parent | 4455db6ad1a644124536135971825f1e88471522 (diff) | |
photosurface demo: behavior depends on initialization order
The file dialog wasn't appearing on the mac. This way seems to work.
We have a long-term bug here but this workaround will look better for
the release.
Change-Id: I8538ca5dc11a063591bc4557fd3779c5bb3768b5
Task-number: QTBUG-31699
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
| -rw-r--r-- | examples/quick/demos/photosurface/photosurface.qml | 5 | ||||
| -rw-r--r-- | tests/auto/quick/examples/tst_examples.cpp | 1 |
2 files changed, 4 insertions, 2 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/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 |