From 4010c702692de3986e672c6a5ce0ce60f36a2492 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 24 Oct 2012 15:03:49 +0200 Subject: namespace "module" pri files we now have tool and soon plugin pri files. make them easily distinguishable. Change-Id: I8904e4182227a78060121e8712446bc43b1dd185 Reviewed-by: Joerg Bornemann --- mkspecs/features/qt_module.prf | 2 +- mkspecs/features/qt_module_fwdpri.prf | 2 +- mkspecs/features/qt_tool.prf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 878867099a..79a4d80279 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -41,7 +41,7 @@ load(qt_build_paths) exists($$MODULE_PRI)|error("Specified module pri file $$MODULE_PRI does not exist.") } else { -MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_$${MODULE}.pri +MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri !build_pass { diff --git a/mkspecs/features/qt_module_fwdpri.prf b/mkspecs/features/qt_module_fwdpri.prf index 17c0ba20ee..4c3a4b433f 100644 --- a/mkspecs/features/qt_module_fwdpri.prf +++ b/mkspecs/features/qt_module_fwdpri.prf @@ -4,7 +4,7 @@ isEmpty(MODULE_INSTALL_LIBS): MODULE_INSTALL_LIBS = $$[QT_INSTALL_LIBS/raw] - MODULE_FWD_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_$${MODULE}.pri + MODULE_FWD_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_lib_$${MODULE}.pri # -rpath-link is used by the linker to find depedencies of dynamic # libraries which were NOT specified on the command line. diff --git a/mkspecs/features/qt_tool.prf b/mkspecs/features/qt_tool.prf index 13caa28a49..c17e90816e 100644 --- a/mkspecs/features/qt_tool.prf +++ b/mkspecs/features/qt_tool.prf @@ -22,7 +22,7 @@ INSTALLS += target cmd = $$shell_path($$QMAKE_RESOLVED_TARGET) qtAddTargetEnv(cmd) - TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_$${MODULE}.pri + TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_tool_$${MODULE}.pri TOOL_PRI_CONT = "QT_TOOL.$${MODULE}.command = $$val_escape(cmd)" write_file($$TOOL_PRI, TOOL_PRI_CONT)|error("Aborting.") -- cgit v1.2.3