diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-22 16:35:41 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-04-22 16:35:43 +0200 |
| commit | 4c231d5df3040dbf4545a9a77145ee0e1f9c380c (patch) | |
| tree | 2cc5b71a5d2b464214cf5372776913fbe4622e1e /tools | |
| parent | 7df16fb4ccbe0476bc34274a77e98eec4e8d2d93 (diff) | |
| parent | d672ef07681a959d9559dd1e11e70db1f448a7f1 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Change-Id: I059725e3b7d7ffd5a16a0931e6c17200917172b5
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/environment.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/configure/environment.cpp b/tools/configure/environment.cpp index b7cbcc5cb9..1b4053ccdf 100644 --- a/tools/configure/environment.cpp +++ b/tools/configure/environment.cpp @@ -146,7 +146,7 @@ Compiler Environment::compilerFromQMakeSpec(const QString &qmakeSpec) { if (qmakeSpec == QLatin1String("win32-msvc2012")) return CC_NET2012; - if (qmakeSpec == QLatin1String("win32-msvc2012")) + if (qmakeSpec == QLatin1String("win32-msvc2010")) return CC_NET2010; if (qmakeSpec == QLatin1String("win32-msvc2008")) return CC_NET2008; |