setup-qt: mark ActiveQt libs as static for Qt4

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

1 files changed, 9 insertions, 1 deletions

diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index 1e50ba08b..fda3c7b7b 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -50,7 +50,8 @@ struct QtModuleInfo
     QtModuleInfo(const QString &name, const QString &qbsName,
                  const QStringList &deps = QStringList())
         : name(name), qbsName(qbsName), dependencies(deps),
-          hasLibrary(!qbsName.endsWith(QLatin1String("-private")))
+          hasLibrary(!qbsName.endsWith(QLatin1String("-private"))),
+          isStaticLibrary(false)
     {
         const QString coreModule = QLatin1String("core");
         if (qbsName != coreModule && !dependencies.contains(coreModule))
@@ -65,6 +66,7 @@ struct QtModuleInfo
     QStringList dependencies; // qbs names.
     QStringList includePaths;
     bool hasLibrary;
+    bool isStaticLibrary;
 };
 
 static QString qtModuleName(const QtModuleInfo &module)
@@ -207,6 +209,7 @@ static void createModules(Profile &profile, Settings *settings,
 
         QtModuleInfo axcontainer(QLatin1String("QAxContainer"), QLatin1String("axcontainer"));
         axcontainer.modulePrefix = QLatin1String("Q");
+        axcontainer.isStaticLibrary = true;
         modules << axcontainer;
 
         QtModuleInfo axserver = axcontainer;
@@ -341,6 +344,11 @@ static void createModules(Profile &profile, Settings *settings,
                     propertiesString += "\n    ";
                 propertiesString += "qtModulePrefix: \"" + module.modulePrefix.toUtf8() + '"';
             }
+            if (module.isStaticLibrary) {
+                if (!propertiesString.isEmpty())
+                    propertiesString += "\n    ";
+                propertiesString += "isStaticLibrary: true";
+            }
             content.replace("### special properties", propertiesString);
             moduleFile.resize(0);
             moduleFile.write(content);