aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/qtprofilesetup/qtprofilesetup.cpp
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-05-18 17:51:39 +0200
committerJoerg Bornemann <joerg.bornemann@theqtcompany.com>2015-05-19 08:35:10 +0000
commite703ca1c84b0f51f3c9d82bdfe7bc646afcb9582 (patch)
tree9ecd5bdf9248cc5dd4e915ea8f7dec19bdd42076 /src/lib/qtprofilesetup/qtprofilesetup.cpp
parent5a462306f2a156b7f99796906e68eee36a8a879f (diff)
fix setup-qt for static builds of Qt4
Treat every Qt4 module as static library if the Qt build is static. Change-Id: If31f45c775aab583a0bfb68345c9d5b977d8de97 Task-number: QBS-804 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>
Diffstat (limited to 'src/lib/qtprofilesetup/qtprofilesetup.cpp')
-rw-r--r--src/lib/qtprofilesetup/qtprofilesetup.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index 176bcce01..de5240a85 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -303,10 +303,10 @@ void doSetupQtProfile(const QString &profileName, Settings *settings,
const QtEnvironment &_qtEnvironment)
{
QtEnvironment qtEnvironment = _qtEnvironment;
- const bool staticBuild = checkForStaticBuild(qtEnvironment);
+ qtEnvironment.staticBuild = checkForStaticBuild(qtEnvironment);
// determine whether user apps require C++11
- if (qtEnvironment.qtConfigItems.contains(QLatin1String("c++11")) && staticBuild)
+ if (qtEnvironment.qtConfigItems.contains(QLatin1String("c++11")) && qtEnvironment.staticBuild)
qtEnvironment.configItems.append(QLatin1String("c++11"));
Profile profile(profileName, settings);
@@ -326,7 +326,7 @@ void doSetupQtProfile(const QString &profileName, Settings *settings,
profile.setValue(settingsTemplate.arg(QLatin1String("buildVariant")), qtEnvironment.buildVariant); // TODO: Remove in 1.5
profile.setValue(settingsTemplate.arg(QLatin1String("availableBuildVariants")),
qtEnvironment.buildVariant);
- profile.setValue(settingsTemplate.arg(QLatin1String("staticBuild")), staticBuild);
+ profile.setValue(settingsTemplate.arg(QLatin1String("staticBuild")), qtEnvironment.staticBuild);
// Set the minimum operating system versions appropriate for this Qt version
const QString windowsVersion = guessMinimumWindowsVersion(qtEnvironment);