diff options
Diffstat (limited to 'mkspecs/features/qml_plugin.prf')
| -rw-r--r-- | mkspecs/features/qml_plugin.prf | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/mkspecs/features/qml_plugin.prf b/mkspecs/features/qml_plugin.prf index f9beabdc18..70c3bd6b66 100644 --- a/mkspecs/features/qml_plugin.prf +++ b/mkspecs/features/qml_plugin.prf @@ -18,12 +18,8 @@ if(win32|mac):!macx-xcode { contains(QT_CONFIG, debug_and_release):CONFIG += debug_and_release contains(QT_CONFIG, build_all):CONFIG += build_all } -contains(QT_CONFIG, reduce_exports):CONFIG += hide_symbols -contains(QT_CONFIG, separate_debug_info):CONFIG += separate_debug_info -contains(QT_CONFIG, separate_debug_info_nocopy):CONFIG += separate_debug_info_nocopy -contains(QT_CONFIG, c++11):CONFIG += c++11 -isEmpty(CXX_MODULE) { +!no_cxx_module:isEmpty(CXX_MODULE) { CXX_MODULE = $$TARGET TARGET = declarative_$${TARGET} } @@ -34,11 +30,13 @@ exists($$QMLTYPEFILE): QML_FILES += $$QMLTYPEFILE # Install rules +load(qt_build_paths) + qml1_target { - DESTDIR = $$eval(QT.$${CXX_MODULE}.imports)/$$TARGETPATH + DESTDIR = $$MODULE_BASE_OUTDIR/imports/$$TARGETPATH instbase = $$[QT_INSTALL_IMPORTS] } else { - DESTDIR = $$eval(QT.$${CXX_MODULE}.qml)/$$TARGETPATH + DESTDIR = $$MODULE_BASE_OUTDIR/qml/$$TARGETPATH instbase = $$[QT_INSTALL_QML] } @@ -50,6 +48,7 @@ INSTALLS += target TARGET = $$qtLibraryTarget($$TARGET) load(qt_targets) +load(qt_common) # plugins.qmltypes is used by Qt Creator for syntax highlighting and the QML code model. It needs # to be regenerated whenever the QML elements exported by the plugin change. This cannot be done @@ -61,7 +60,14 @@ load(qt_targets) # !cross_compile { build_pass|!debug_and_release { - isEmpty(IMPORT_VERSION): IMPORT_VERSION = $$eval(QT.$${CXX_MODULE}.MAJOR_VERSION).$$eval(QT.$${CXX_MODULE}.MINOR_VERSION) + isEmpty(IMPORT_VERSION) { + no_cxx_module { + IMPORT_VERSION = $$replace(MODULE_VERSION, ^(\\d+\\.\\d+).*, \\1) + isEmpty(IMPORT_VERSION): error("Must set IMPORT_VERSION") + } else { + IMPORT_VERSION = $$eval(QT.$${CXX_MODULE}.MAJOR_VERSION).$$eval(QT.$${CXX_MODULE}.MINOR_VERSION) + } + } load(resolve_target) qml1_target: \ @@ -94,7 +100,7 @@ unix|win32-g++* { !isEmpty(_QMAKE_SUPER_CACHE_): \ lib_replace.match = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*/lib else: \ - lib_replace.match = $$eval(QT.$${CXX_MODULE}.libs) + lib_replace.match = $$MODULE_BASE_OUTDIR lib_replace.replace = $$[QT_INSTALL_LIBS/raw] QMAKE_PRL_INSTALL_REPLACE += lib_replace } |