diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:06:30 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-12 18:06:30 +0100 |
| commit | 82913414623f36acb3d2c07d6c124af9f61fcdb4 (patch) | |
| tree | 610f66dd1fcb487e20bbf18587e8cfad38a40826 /src/imports | |
| parent | d34098d8981d9103626ff7264e7b5ec084bfb63e (diff) | |
| parent | f95fdacb3a12e4f0d37d3c32b34326f2bd1536de (diff) | |
Merge remote-tracking branch 'origin/release' into stable
Conflicts:
src/qml/qml/qqmlcompiler.cpp
Change-Id: I802731139d47c5b733dd805f7bf432d67d7331e1
Diffstat (limited to 'src/imports')
| -rw-r--r-- | src/imports/dialogs-private/qmldir | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/imports/dialogs-private/qmldir b/src/imports/dialogs-private/qmldir index e184715519..c371f8bb8c 100644 --- a/src/imports/dialogs-private/qmldir +++ b/src/imports/dialogs-private/qmldir @@ -1,3 +1,4 @@ module QtQuick.Dialogs.Private plugin dialogsprivateplugin typeinfo plugins.qmltypes +classname QtQuick2DialogsPrivatePlugin |