Merge branch 'master' of git@scm.dev.nokia.troll.no:creator/mainline

2009-03-26 17:38:18 +01:00
parent 0a2df32654 8ba891bb0c
commit 145c1fb94d
28 changed files with 925 additions and 399 deletions
--- a/src/plugins/cmakeprojectmanager/cmakeproject.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeproject.cpp
@@ -260,6 +260,7 @@ void CMakeProject::parseCMakeLists()

 QString CMakeProject::buildParser(const QString &buildConfiguration) const
 {
+    Q_UNUSED(buildConfiguration);
    // TODO this is actually slightly wrong, but do i care?
    // this should call toolchain(buildConfiguration)
    if (!m_toolChain)