Skip to content

Commit

Permalink
Deploy QML plugin type information to correct directory.
Browse files Browse the repository at this point in the history
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>
(cherry picked from commit a7ef31b)
  • Loading branch information
Slow3000 authored and martyone committed Apr 27, 2016
1 parent 60c54af commit 902d05c
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 1 deletion.
2 changes: 1 addition & 1 deletion qtwebkit/Source/WebKit/qt/declarative/public.pri
Expand Up @@ -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
2 changes: 2 additions & 0 deletions qtwebkit/Source/WebKit/qt/declarative/qmldir
@@ -1,3 +1,5 @@
module QtWebKit
plugin qmlwebkitplugin
classname WebKitQmlPlugin
typeinfo plugins.qmltypes

0 comments on commit 902d05c

Please sign in to comment.