qtprofilesetup: Call fillEntryPointLibs() only when necessary

This function is parameterized by build variant. It should only be
called if libraries for the respective build variant are present in the
Qt installation.

Change-Id: Ie43958c54e16bdfedf60a8c0339098eb8d694165
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>

1 files changed, 8 insertions, 2 deletions

diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp
index 7b8b9c49b..658aa696f 100644
--- a/src/lib/qtprofilesetup/qtprofilesetup.cpp
+++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp
@@ -724,8 +724,14 @@ void doSetupQtProfile(const QString &profileName, Settings *settings,
         const Version qtVersion = Version(qtEnvironment.qtMajorVersion,
                                           qtEnvironment.qtMinorVersion,
                                           qtEnvironment.qtPatchVersion);
-        qtEnvironment.entryPointLibsDebug = fillEntryPointLibs(qtEnvironment, qtVersion, true);
-        qtEnvironment.entryPointLibsRelease = fillEntryPointLibs(qtEnvironment, qtVersion, false);
+        if (qtEnvironment.buildVariant.contains(QLatin1String("debug"))) {
+            qtEnvironment.entryPointLibsDebug = fillEntryPointLibs(qtEnvironment, qtVersion,
+                                                                   true);
+        }
+        if (qtEnvironment.buildVariant.contains(QLatin1String("release"))) {
+            qtEnvironment.entryPointLibsRelease = fillEntryPointLibs(qtEnvironment, qtVersion,
+                                                                     false);
+        }
     } else if (qtEnvironment.mkspecPath.contains(QLatin1String("macx"))) {
         if (qtEnvironment.qtMajorVersion >= 5) {
             QFile qmakeConf(qtEnvironment.mkspecPath + QStringLiteral("/qmake.conf"));