diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-21 17:10:25 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-06 16:33:25 +0000 |
commit | 4e5b013e32d8d6ca9b58d5f8476ceadb7c86dacc (patch) | |
tree | 32365056d85bd101099366071709172de4cbfa5e /mkspecs | |
parent | f8607045c47b6713efe809e53ce04a3eb7b631e8 (diff) |
stop exporting QT.*.{libexecs,plugins,imports,qml} in module pris
these are not referenced anywhere, and neither should they, as they are
not relevant to _using_ these modules in any way.
notably, QT.*.bins remains exported - this is because dlls reside there,
so it is necessary for setting up a launch environment.
Change-Id: I7a33c72be6e4789ea29a2fbbcac9588213900b6e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/features/qt_config.prf | 8 | ||||
-rw-r--r-- | mkspecs/features/qt_module_pris.prf | 14 |
2 files changed, 1 insertions, 21 deletions
diff --git a/mkspecs/features/qt_config.prf b/mkspecs/features/qt_config.prf index 973a2182c9..93c54e3010 100644 --- a/mkspecs/features/qt_config.prf +++ b/mkspecs/features/qt_config.prf @@ -26,11 +26,7 @@ QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] QT_MODULE_HOST_LIB_BASE = $$[QT_HOST_LIBS] - QT_MODULE_PLUGIN_BASE = $$[QT_INSTALL_PLUGINS] - QT_MODULE_LIBEXEC_BASE = $$[QT_INSTALL_LIBEXECS] QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] - QT_MODULE_IMPORT_BASE = $$[QT_INSTALL_IMPORTS] - QT_MODULE_QML_BASE = $$[QT_INSTALL_QML] include($$mod) } unset(mods) @@ -39,11 +35,7 @@ QMAKE_QT_CONFIG = $$[QT_HOST_DATA/get]/mkspecs/qconfig.pri unset(QT_MODULE_INCLUDE_BASE) unset(QT_MODULE_LIB_BASE) unset(QT_MODULE_HOST_LIB_BASE) - unset(QT_MODULE_PLUGIN_BASE) - unset(QT_MODULE_LIBEXEC_BASE) unset(QT_MODULE_BIN_BASE) - unset(QT_MODULE_IMPORT_BASE) - unset(QT_MODULE_QML_BASE) } load(qt_functions) diff --git a/mkspecs/features/qt_module_pris.prf b/mkspecs/features/qt_module_pris.prf index 43ccf203bb..77bedb1d7f 100644 --- a/mkspecs/features/qt_module_pris.prf +++ b/mkspecs/features/qt_module_pris.prf @@ -119,10 +119,6 @@ defineReplace(qtExportLibsForModule) { "QT.$${MODULE_ID}.frameworks =$$MODULE_FRAMEWORKS" !host_build: MODULE_PRI_CONT += \ "QT.$${MODULE_ID}.bins = \$\$QT_MODULE_BIN_BASE" \ - "QT.$${MODULE_ID}.libexecs = \$\$QT_MODULE_LIBEXEC_BASE" \ - "QT.$${MODULE_ID}.plugins = \$\$QT_MODULE_PLUGIN_BASE" \ - "QT.$${MODULE_ID}.imports = \$\$QT_MODULE_IMPORT_BASE" \ - "QT.$${MODULE_ID}.qml = \$\$QT_MODULE_QML_BASE" \ $$module_plugtypes MODULE_PRI_CONT += \ "QT.$${MODULE_ID}.depends =$$join(MODULE_DEPENDS, " ", " ")" \ @@ -175,12 +171,8 @@ defineReplace(qtExportLibsForModule) { MODULE_FWD_PRI_CONT = \ "QT_MODULE_BIN_BASE = $$val_escape(MODULE_BASE_OUTDIR)/bin" \ "QT_MODULE_INCLUDE_BASE = $$val_escape(MODULE_BASE_INCDIR)/include" \ - "QT_MODULE_IMPORT_BASE = $$val_escape(MODULE_BASE_OUTDIR)/imports" \ - "QT_MODULE_QML_BASE = $$val_escape(MODULE_BASE_OUTDIR)/qml" \ "QT_MODULE_LIB_BASE = $$val_escape(MODULE_BASE_OUTDIR)/lib" \ "QT_MODULE_HOST_LIB_BASE = $$val_escape(MODULE_BASE_OUTDIR)/lib" \ - "QT_MODULE_LIBEXEC_BASE = $$val_escape(MODULE_BASE_OUTDIR)/libexec" \ - "QT_MODULE_PLUGIN_BASE = $$val_escape(MODULE_BASE_OUTDIR)/plugins" \ "include($$val_escape(MODULE_PRI))" \ "QT.$${MODULE_ID}.priority = 1" !internal_module:!no_private_module: MODULE_FWD_PRI_CONT += \ @@ -204,12 +196,8 @@ defineReplace(qtExportLibsForModule) { # This is needed for the direct include() below. Mirrors qt_config.prf QT_MODULE_BIN_BASE = $$[QT_INSTALL_BINS] QT_MODULE_INCLUDE_BASE = $$[QT_INSTALL_HEADERS] - QT_MODULE_IMPORT_BASE = $$[QT_INSTALL_IMPORTS] - QT_MODULE_QML_BASE = $$[QT_INSTALL_QML] QT_MODULE_LIB_BASE = $$[QT_INSTALL_LIBS] QT_MODULE_HOST_LIB_BASE = $$[QT_HOST_LIBS] - QT_MODULE_LIBEXEC_BASE = $$[QT_INSTALL_LIBEXECS] - QT_MODULE_PLUGIN_BASE = $$[QT_INSTALL_PLUGINS] } @@ -221,7 +209,7 @@ defineReplace(qtExportLibsForModule) { for(mod, mods_to_load) { for(var, $$list(VERSION MAJOR_VERSION MINOR_VERSION PATCH_VERSION \ name module depends run_depends plugin_types module_config CONFIG DEFINES \ - priority includes bins libs frameworks libexecs plugins imports qml \ + priority includes bins libs frameworks \ winrt_capabilities winrt_capabilities_device \ )):defined(QT.$${mod}.$$var, var):cache(QT.$${mod}.$$var, transient) } |