diff options
| author | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-10-06 18:42:53 +0200 |
|---|---|---|
| committer | Fawzi Mohamed <fawzi.mohamed@digia.com> | 2014-10-31 13:42:04 +0100 |
| commit | 433c3d876d2f7266efa963def47fa9ef1a483cbc (patch) | |
| tree | be847d7b7454cd62ec3d15597bbe73fb83a7d9a8 | |
| parent | fd0446f418a74646ddf4325412d0a60e8091ebc1 (diff) | |
avoid creation of empty qmltypes for qtquick1
Change-Id: Ic28043a94151d3878219e5808075ce6ae663c316
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@theqtcompany.com>
| -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 |