diff options
| author | Michael Brüning <michael.bruning@digia.com> | 2014-05-15 14:27:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-16 11:39:22 +0200 |
| commit | a7ef31b64324fa43623e768a0798175884bd6e79 (patch) | |
| tree | f177399300304e6b57bdf7b2b8f1dd8c2c91b111 | |
| parent | 18ce42d5e39ce34e38be49c9fcdd78329899a075 (diff) | |
| download | qtwebkit-a7ef31b64324fa43623e768a0798175884bd6e79.tar.gz | |
Deploy QML plugin type information to correct directory.
This adds the plugins.qmltypes file to the list of files that are
deployed to the qml/QtWebKit directory.
This is needed e.g. for auto-completion in Creator.
Patch co-authored with Fawzi Mohamed.
Task-number: QTBUG-39013
Change-Id: Icce9a168a0558652b810ad16c89895e24a6fc6ef
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
| -rw-r--r-- | Source/WebKit/qt/declarative/public.pri | 2 | ||||
| -rw-r--r-- | Source/WebKit/qt/declarative/qmldir | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/Source/WebKit/qt/declarative/public.pri b/Source/WebKit/qt/declarative/public.pri index 5fc5985eb..8bb158b66 100644 --- a/Source/WebKit/qt/declarative/public.pri +++ b/Source/WebKit/qt/declarative/public.pri @@ -48,7 +48,7 @@ isEmpty(importPath): importPath = $$[QT_INSTALL_IMPORTS] target.path = $${importPath}/$${TARGET.module_name} -qmldir.files += $$PWD/qmldir +qmldir.files += $$PWD/qmldir $$PWD/plugins.qmltypes qmldir.path += $${importPath}/$${TARGET.module_name} INSTALLS += target qmldir diff --git a/Source/WebKit/qt/declarative/qmldir b/Source/WebKit/qt/declarative/qmldir index 962e92f06..b590a78b9 100644 --- a/Source/WebKit/qt/declarative/qmldir +++ b/Source/WebKit/qt/declarative/qmldir @@ -1,3 +1,5 @@ module QtWebKit plugin qmlwebkitplugin +classname WebKitQmlPlugin typeinfo plugins.qmltypes + |