diff options
| -rw-r--r-- | Source/WebKit/qt/declarative/public.pri | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/WebKit/qt/declarative/public.pri b/Source/WebKit/qt/declarative/public.pri index 8bb158b66..d669162e4 100644 --- a/Source/WebKit/qt/declarative/public.pri +++ b/Source/WebKit/qt/declarative/public.pri @@ -40,15 +40,16 @@ build?(webkit2): { QT += network } -# The fallback to QT_INSTALL_IMPORTS can be removed once we -# depend on Qt 5 RC1. -importPath = $$[QT_INSTALL_QML] -isEmpty(importPath): importPath = $$[QT_INSTALL_IMPORTS] - -target.path = $${importPath}/$${TARGET.module_name} +importPath = $$[QT_INSTALL_QML] +isEmpty(importPath){ + importPath = $$[QT_INSTALL_IMPORTS] +} else { + target.path = $${importPath}/$${TARGET.module_name} + INSTALLS += target +} qmldir.files += $$PWD/qmldir $$PWD/plugins.qmltypes qmldir.path += $${importPath}/$${TARGET.module_name} -INSTALLS += target qmldir +INSTALLS += qmldir |