namespace "module" pri files

we now have tool and soon plugin pri files. make them easily
distinguishable.

Change-Id: I8904e4182227a78060121e8712446bc43b1dd185
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf
index 8788670..79a4d80 100644 (file)
--- 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 17c0ba2..4c3a4b4 100644 (file)
--- 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 13caa28..c17e908 100644 (file)
--- 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.")