setup-qt: fix module prefix for ActiveQt

Task-number: QBS-598
Change-Id: I3c722239bf51317e55a028680c03c31629f5ed0b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

1 files changed, 15 insertions, 2 deletions

diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index 9774ef39d..1e50ba08b 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -59,6 +59,7 @@ struct QtModuleInfo
 
     QtModuleInfo() : hasLibrary(true) {}
 
+    QString modulePrefix; // default is empty and means "Qt".
     QString name; // As in the path to the headers and ".name" in the pri files.
     QString qbsName; // Lower-case version without "qt" prefix.
     QStringList dependencies; // qbs names.
@@ -200,12 +201,19 @@ static void createModules(Profile &profile, Settings *settings,
                 << QtModuleInfo(QLatin1String("QtTest"), QLatin1String("testlib"))
                 << QtModuleInfo(QLatin1String("QtTest"), QLatin1String("testlib-private"),
                                 QStringList() << QLatin1String("testlib"))
-                << QtModuleInfo(QLatin1String("QAxContainer"), QLatin1String("axcontainer"))
-                << QtModuleInfo(QLatin1String("QAxServer"), QLatin1String("axserver"))
                 << QtModuleInfo(QLatin1String("QtDBus"), QLatin1String("dbus"))
                 << QtModuleInfo(QLatin1String("QtDBus"), QLatin1String("dbus-private"),
                                 QStringList() << QLatin1String("dbus"));
 
+        QtModuleInfo axcontainer(QLatin1String("QAxContainer"), QLatin1String("axcontainer"));
+        axcontainer.modulePrefix = QLatin1String("Q");
+        modules << axcontainer;
+
+        QtModuleInfo axserver = axcontainer;
+        axserver.name = QLatin1String("QAxServer");
+        axserver.qbsName = QLatin1String("axserver");
+        modules << axserver;
+
         QtModuleInfo designerComponentsPrivate(QLatin1String("QtDesignerComponents"),
                 QLatin1String("designercomponents-private"),
                 QStringList() << QLatin1String("gui-private") << QLatin1String("designer-private"));
@@ -328,6 +336,11 @@ static void createModules(Profile &profile, Settings *settings,
                         "    cpp.defines: "
                         "qmlDebugging ? base.concat('" + debugMacro + "') : base";
             }
+            if (!module.modulePrefix.isEmpty()) {
+                if (!propertiesString.isEmpty())
+                    propertiesString += "\n    ";
+                propertiesString += "qtModulePrefix: \"" + module.modulePrefix.toUtf8() + '"';
+            }
             content.replace("### special properties", propertiesString);
             moduleFile.resize(0);
             moduleFile.write(content);