diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-01-16 13:47:50 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-01-16 13:48:15 +0100 |
| commit | 7497dc48e674ee155aeebf0986be5a929ce15877 (patch) | |
| tree | 87f575b7ce612b7130b91fd4c9b4e3dc437ff612 /src/dialogs/qmldir | |
| parent | 46d983e08cdece92a62833dc74f37e2f11a66324 (diff) | |
| parent | 5abfd7c00bc7ebfec2f059adc9bc22eb989ae10d (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
tests/auto/controls/data/tst_stackview.qml
Change-Id: I54b55d51452e812315f97bcdfd1a8e361a427f56
Diffstat (limited to 'src/dialogs/qmldir')
| -rw-r--r-- | src/dialogs/qmldir | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dialogs/qmldir b/src/dialogs/qmldir index 37e1efff7..df0d402be 100644 --- a/src/dialogs/qmldir +++ b/src/dialogs/qmldir @@ -4,3 +4,4 @@ classname QtQuick2DialogsPlugin typeinfo plugins.qmltypes depends Qt.labs.folderlistmodel 1.0 depends Qt.labs.settings 1.0 +depends QtQuick.Dialogs.Private 1.0 |