give init.cpp files unique names

Prefix by the package name, e.g. com_trolltech_qt_core_init.cpp.
This way qmake doesn't get confused if you include multiple .pri
files in the same project.

4 files changed, 9 insertions, 8 deletions

diff --git a/generator/classgenerator.cpp b/generator/classgenerator.cpp
index 701e21a..ea2de78 100644
--- a/generator/classgenerator.cpp
+++ b/generator/classgenerator.cpp
@@ -1824,7 +1824,7 @@ void ClassGenerator::write(QTextStream &stream, const AbstractMetaClass *meta_cl
 
     writeInjectedCode(stream, meta_class, CodeSnip::End);
 
-    QString pro_file_name = meta_class->package().replace(".", "_") + "/" + meta_class->package().replace(".", "_") + ".pri";
-    priGenerator->addSource(pro_file_name, fileNameForClass(meta_class));
+    QString packName = meta_class->package().replace(".", "_");
+    priGenerator->addSource(packName, fileNameForClass(meta_class));
     setupGenerator->addClass(meta_class);
 }
diff --git a/generator/prigenerator.cpp b/generator/prigenerator.cpp
index 5b787d6..2cb4d19 100644
--- a/generator/prigenerator.cpp
+++ b/generator/prigenerator.cpp
@@ -44,7 +44,8 @@ void PriGenerator::generate()
         if (list.isEmpty())
             continue;
 
-        FileOut file(m_out_dir + "/generated_cpp/" + pri.key());
+        QString folder = pri.key();
+        FileOut file(m_out_dir + "/generated_cpp/" + folder + "/" + folder + ".pri");
         file.stream << "HEADERS += \\\n";
         qSort(list.begin(), list.end());
         foreach (const QString &entry, list) {
@@ -58,7 +59,7 @@ void PriGenerator::generate()
         foreach (const QString &entry, list) {
             file.stream << "           $$PWD/" << entry << " \\\n";
         }
-        file.stream << "           $$PWD/init.cpp\n";
+        file.stream << "           $$PWD/" << folder << "_init.cpp\n";
 
         if (file.done())
             ++m_num_generated_written;
diff --git a/generator/setupgenerator.cpp b/generator/setupgenerator.cpp
index c07601e..f9b3e18 100644
--- a/generator/setupgenerator.cpp
+++ b/generator/setupgenerator.cpp
@@ -58,7 +58,7 @@ void SetupGenerator::generate()
         packName.replace(".", "_");
 
         {
-            FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/init.cpp");
+            FileOut initFile(m_out_dir + "/generated_cpp/" + packName + "/" + packName + "_init.cpp");
             QTextStream &s = initFile.stream;
 
             if (FileOut::license)
diff --git a/generator/shellheadergenerator.cpp b/generator/shellheadergenerator.cpp
index 5f74af1..86bafed 100644
--- a/generator/shellheadergenerator.cpp
+++ b/generator/shellheadergenerator.cpp
@@ -60,11 +60,11 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c
 
     s << "#include <QtScript/qscriptvalue.h>" << endl << endl;
 
-    QString pro_file_name = meta_class->package().replace(".", "_") + "/" + meta_class->package().replace(".", "_") + ".pri";
+    QString packName = meta_class->package().replace(".", "_");
 
     if (!meta_class->generateShellClass()) {
         s << "#endif" << endl << endl;
-        priGenerator->addHeader(pro_file_name, fileNameForClass(meta_class));
+        priGenerator->addHeader(packName, fileNameForClass(meta_class));
         return ;
     }
 
@@ -105,7 +105,7 @@ void ShellHeaderGenerator::write(QTextStream &s, const AbstractMetaClass *meta_c
     s  << "};" << endl << endl
        << "#endif // " << include_block << endl;
 
-    priGenerator->addHeader(pro_file_name, fileNameForClass(meta_class));
+    priGenerator->addHeader(packName, fileNameForClass(meta_class));
 }
 
 void ShellHeaderGenerator::writeInjectedCode(QTextStream &s, const AbstractMetaClass *meta_class)