diff options
author | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-05-24 10:38:44 +0200 |
---|---|---|
committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2018-05-24 10:54:11 +0000 |
commit | 045ee1cd01a334f2f6b1b68da08ad29b6ba64559 (patch) | |
tree | 2327315199d73056c61fc0e659a484f438ced75a | |
parent | e59065e81c69b7c9fae2dfb73c6575dff69fb680 (diff) |
Fix file tag for Qt libraries in qtprofilesetup
The check env.msvcVersion.isValid() doesn't work for Qt Creator,
because we never set the MSVC version for a QtEnvironment there.
Use the isMsvcQt function instead.
Change-Id: I9cfef1bc6383551fc3382408d18a239c4f7d0339
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
-rw-r--r-- | src/lib/qtprofilesetup/qtprofilesetup.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/qtprofilesetup/qtprofilesetup.cpp b/src/lib/qtprofilesetup/qtprofilesetup.cpp index 4ef952985..055e7c6b1 100644 --- a/src/lib/qtprofilesetup/qtprofilesetup.cpp +++ b/src/lib/qtprofilesetup/qtprofilesetup.cpp @@ -40,6 +40,7 @@ #include "qtprofilesetup.h" #include "qtmoduleinfo.h" +#include "qtmsvctools.h" #include <logging/translator.h> #include <tools/architectures.h> @@ -420,7 +421,7 @@ static QByteArray libraryFileTag(const QtEnvironment &env, const QtModuleInfo &m if (module.isStaticLibrary) result = "staticlibrary"; else - result = env.msvcVersion.isValid() ? "dynamiclibrary_import" : "dynamiclibrary"; + result = isMsvcQt(env) ? "dynamiclibrary_import" : "dynamiclibrary"; return result; } |