diff options
| author | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-04-04 10:06:16 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@nokia.com> | 2011-04-04 10:06:16 +0200 |
| commit | 321989304211c698633e5f7c11942eb6de9513c3 (patch) | |
| tree | f5693efde6c1b06fbe0e75917196b0083c2e049e | |
| parent | b606a7c4b072c8d2107a60bbbb29efec8fced30f (diff) | |
fix Qt version checkv1.1.9
For MSVC2010 we also have to allow qmake's MSBUILD generator.
Task-number: QTVSADDINBUG-68
| -rw-r--r-- | Qt4VS2003/Qt4VSAddin/AddQtVersionDialog.cs | 2 | ||||
| -rw-r--r-- | Qt4VS2003/Qt4VSAddin/StringResources.de.resx | 2 | ||||
| -rw-r--r-- | Qt4VS2003/Qt4VSAddin/StringResources.resx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/Qt4VS2003/Qt4VSAddin/AddQtVersionDialog.cs b/Qt4VS2003/Qt4VSAddin/AddQtVersionDialog.cs index 9b06b265..428d6b6e 100644 --- a/Qt4VS2003/Qt4VSAddin/AddQtVersionDialog.cs +++ b/Qt4VS2003/Qt4VSAddin/AddQtVersionDialog.cs @@ -255,7 +255,7 @@ namespace Qt4VSAddin } string makefileGenerator = versionInfo.GetQMakeConfEntry("MAKEFILE_GENERATOR"); - if (makefileGenerator == "MSVC.NET") + if (makefileGenerator == "MSVC.NET" || makefileGenerator == "MSBUILD") { string compilerDefines = versionInfo.GetQMakeConfEntry("QMAKE_COMPILER_DEFINES"); string mscVersion = "0"; diff --git a/Qt4VS2003/Qt4VSAddin/StringResources.de.resx b/Qt4VS2003/Qt4VSAddin/StringResources.de.resx index e489927d..5b892454 100644 --- a/Qt4VS2003/Qt4VSAddin/StringResources.de.resx +++ b/Qt4VS2003/Qt4VSAddin/StringResources.de.resx @@ -229,7 +229,7 @@ <value>Die Qt Version ist inkompatibel mit der aktuellen Visual Studio Version (VS Version des Qt Build: {0}, aktuelle Version: {1})</value> </data> <data name="AddQtVersionDialog_IncorrectMakefileGenerator" xml:space="preserve"> - <value>Die Qt Version nutzt einen nicht unterstützten Makefile Generator (genutzt: {0}, unsterstützt: MSVC.NET)</value> + <value>Die Qt Version nutzt einen nicht unterstützten Makefile Generator (genutzt: {0}, unsterstützt: MSVC.NET, MSBUILD)</value> </data> <data name="AddTranslationDialog_Language" xml:space="preserve"> <value>Sprache:</value> diff --git a/Qt4VS2003/Qt4VSAddin/StringResources.resx b/Qt4VS2003/Qt4VSAddin/StringResources.resx index 9b076c6c..cbae325f 100644 --- a/Qt4VS2003/Qt4VSAddin/StringResources.resx +++ b/Qt4VS2003/Qt4VSAddin/StringResources.resx @@ -229,7 +229,7 @@ <value>This Qt version is not compatible to your current Visual Studio (Qt builds VS version: {0}, current version: {1})</value> </data> <data name="AddQtVersionDialog_IncorrectMakefileGenerator" xml:space="preserve"> - <value>This Qt version uses an unsupported makefile generator (used: {0}, supported: MSVC.NET)</value> + <value>This Qt version uses an unsupported makefile generator (used: {0}, supported: MSVC.NET, MSBUILD)</value> </data> <data name="AddTranslationDialog_Language" xml:space="preserve"> <value>Language:</value> |