diff options
Diffstat (limited to 'qmake/generators/win32/msvc_objectmodel.h')
| -rw-r--r-- | qmake/generators/win32/msvc_objectmodel.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qmake/generators/win32/msvc_objectmodel.h b/qmake/generators/win32/msvc_objectmodel.h index f9734e8e1b..10d44970ff 100644 --- a/qmake/generators/win32/msvc_objectmodel.h +++ b/qmake/generators/win32/msvc_objectmodel.h @@ -34,7 +34,6 @@ #include <proitems.h> -#include <qatomic.h> #include <qlist.h> #include <qstring.h> #include <qstringlist.h> @@ -56,6 +55,8 @@ enum DotNET { NET2017 = 0xe0 }; +DotNET vsVersionFromString(const ProString &versionString); + /* This Object model is of course VERY simplyfied, and does not actually follow the original MSVC @@ -869,7 +870,7 @@ public: bool suppressUnknownOptionWarnings; DotNET CompilerVersion; - bool WinRT, WinPhone; + bool WinRT; // Variables triState ATLMinimizesCRunTimeLibraryUsage; |