diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-16 08:53:38 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2011-11-16 13:31:29 (GMT) |
| commit | d4150975af620e2889cc58bd476bac6b4d101db3 (patch) | |
| tree | 15e000be38cc530e25f68066ade6581d14a4f60d /tools/configure/environment.h | |
| parent | 2326a8d878e0d18473c27ddd54880621518b6e6e (diff) | |
| download | Qt-d4150975af620e2889cc58bd476bac6b4d101db3.zip Qt-d4150975af620e2889cc58bd476bac6b4d101db3.tar.gz Qt-d4150975af620e2889cc58bd476bac6b4d101db3.tar.bz2 | |
Windows: Add gcc 4.6.
- Add gcc 4.6 mkspec for > 4.4 (win32-g++-4.6)
- Add detection of g++ version and 64bit to configure.
Reviewed-by: mariusSO
Diffstat (limited to 'tools/configure/environment.h')
| -rw-r--r-- | tools/configure/environment.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/configure/environment.h b/tools/configure/environment.h index 9bbd096..81c232a 100644 --- a/tools/configure/environment.h +++ b/tools/configure/environment.h @@ -49,6 +49,7 @@ enum Compiler { CC_UNKNOWN = 0, CC_BORLAND = 0x01, CC_MINGW = 0x02, + CC_MINGW_44 = 0x21, CC_INTEL = 0x03, CC_NET2003 = 0x71, CC_NET2005 = 0x80, @@ -63,6 +64,8 @@ public: static Compiler detectCompiler(); static QString detectQMakeSpec(); static bool detectExecutable(const QString &executable); + static int detectGPlusPlusVersion(const QString &executable, bool *is64bit); + static QString readProcessStandardOutput(const QString &commandLine); static int execute(QStringList arguments, const QStringList &additionalEnv, const QStringList &removeEnv); static bool cpdir(const QString &srcDir, |