Merge remote-tracking branch 'origin/3.0'

2013-10-14 15:31:54 +02:00
parent f463c4dade f50ffd614c
commit 8474a6f128
276 changed files with 2451 additions and 2043 deletions
--- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
+++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.cpp
@@ -208,7 +208,7 @@ QString CMakeManager::findCbpFile(const QDir &directory)
 {
    // Find the cbp file
    //   the cbp file is named like the project() command in the CMakeList.txt file
-    //   so this method below could find the wrong cbp file, if the user changes the project()
+    //   so this function below could find the wrong cbp file, if the user changes the project()
    //   2name
    QDateTime t;
    QString file;