diff options
| author | dt <qtc-committer@nokia.com> | 2009-10-22 14:22:16 +0200 |
|---|---|---|
| committer | dt <qtc-committer@nokia.com> | 2009-10-22 14:39:00 +0200 |
| commit | cfc7040ede907a7b05c0ed3cc717b2d2d1277de7 (patch) | |
| tree | 14b7d7db6c37a036dcaf8dd3d516ee0595d26b2f /src/plugins/genericprojectmanager/genericproject.cpp | |
| parent | fd0fbddebbf8b78398cc4d26e3bb36b8c445a307 (diff) | |
| download | qt-creator-cfc7040ede907a7b05c0ed3cc717b2d2d1277de7.tar.gz | |
The qtversions's toolchain now depends on the actual compiler not mkspec
That is we actually parse the mkspec and evaluate QMAKE_CXX (and a few
other variables) to figure out the correct mkspec. This makes using
custom mkspecs easier and is also cleaner. I also changed mkspec() and
mkspecPath() to behave a little diffrent, essentialy mkspec() will
return only the name (the actual dir name) of the mkspec. That is in
general not sufficient for passing on to qmake. mkspecPath() only
returns the correct path to mkspecs/default.
Hopefully I haven't broken WinCE/Maemo/MinGW.
Diffstat (limited to 'src/plugins/genericprojectmanager/genericproject.cpp')
| -rw-r--r-- | src/plugins/genericprojectmanager/genericproject.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/genericprojectmanager/genericproject.cpp b/src/plugins/genericprojectmanager/genericproject.cpp index bc7c96138b..d6d9d0a8c1 100644 --- a/src/plugins/genericprojectmanager/genericproject.cpp +++ b/src/plugins/genericprojectmanager/genericproject.cpp @@ -413,7 +413,7 @@ QString GenericProject::buildParser(BuildConfiguration *configuration) const if (m_toolChain) { switch (m_toolChain->type()) { case ProjectExplorer::ToolChain::GCC: - case ProjectExplorer::ToolChain::LinuxICC: + //case ProjectExplorer::ToolChain::LinuxICC: case ProjectExplorer::ToolChain::MinGW: return QLatin1String(ProjectExplorer::Constants::BUILD_PARSER_GCC); |