diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:14:56 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-03-24 16:14:56 +0100 |
| commit | ff5d39f0a8f34cdb034df703e7b2a769c945e1ed (patch) | |
| tree | 56ec1b5d03809653648e2f50d4ff88be4d7951bd /src/dialogs/plugin.cpp | |
| parent | 51156e412b2f91dbbf8c0b6055e6ab4c29370d8a (diff) | |
| parent | b69eb02366ad6d8647238f4caf8edfdcaea1b526 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
tests/auto/controls/data/tst_applicationwindow.qml
Change-Id: I2ba1f1ba9604f9417102ff076e4ab9ab4d37ab7a
Diffstat (limited to 'src/dialogs/plugin.cpp')
| -rw-r--r-- | src/dialogs/plugin.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/dialogs/plugin.cpp b/src/dialogs/plugin.cpp index 7c8c6bea0..74672f657 100644 --- a/src/dialogs/plugin.cpp +++ b/src/dialogs/plugin.cpp @@ -41,6 +41,7 @@ #include <QtQml/qqml.h> #include <QtQml/qqmlextensionplugin.h> +#include <QtQml/qqmlcomponent.h> #include "qquickmessagedialog_p.h" #include "qquickabstractmessagedialog_p.h" #include "qquickdialogassets_p.h" |