Merge lp:~zeller-benjamin/qtcreator-plugin-cmake/codecompletion into lp:qtcreator-plugin-cmake

[Benjamin Zeller]

Enable code completion for Ubuntu Chroots and QML projects

Enable code completion for Ubuntu Chroots and QML projects

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:42
http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-ci/13/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-utopic-amd64-ci/4
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qtcreator-plugin-cmake-utopic-armhf-ci/4

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/qtcreator-plugin-cmake-ci/13/rebuild

review: Approve (continuous-integration)

[Zoltan Balogh (bzoltan)]

OK

review: Approve

=== modified file 'src/cmakeprojectmanager/cmakeproject.cpp'
--- src/cmakeprojectmanager/cmakeproject.cpp	2014-06-03 10:15:38 +0000
+++ src/cmakeprojectmanager/cmakeproject.cpp	2014-09-05 11:42:10 +0000
@@ -64,12 +64,14 @@
 #include <utils/hostosinfo.h>
 #include <utils/qtcprocess.h>
 #include <utils/pathchooser.h>
+#include <utils/fileutils.h>
 #include <coreplugin/icore.h>
 #include <coreplugin/infobar.h>
 #include <coreplugin/documentmanager.h>
 #include <coreplugin/editormanager/editormanager.h>
 #include <coreplugin/variablemanager.h>
 #include <coreplugin/modemanager.h>
+#include <qmljstools/qmljsmodelmanager.h>
 
 #include <QDebug>
 #include <QDir>
@@ -367,6 +369,22 @@
                                 cxxflags,
                                 SysRootKitInformation::sysRoot(k));
 
+        if(tc->type() == QStringLiteral("UbuntuProjectManager.UbuntuGccToolChain")
+                && k
+                && !ProjectExplorer::SysRootKitInformation::sysRoot(k).isEmpty()) {
+            QStringList fixedIncPaths;
+            foreach(QString path, part->includePaths) {
+                if(!path.startsWith(QStringLiteral("/tmp"))
+                        && !path.startsWith(QStringLiteral("/home"))) {
+                    Utils::FileName sRoot = ProjectExplorer::SysRootKitInformation::sysRoot(k);
+                    fixedIncPaths += QDir::cleanPath(sRoot.appendPath(path).toString());
+                } else {
+                    fixedIncPaths += path;
+                }
+            }
+            part->includePaths = fixedIncPaths;
+        }
+
         pinfo.appendProjectPart(part);
         m_codeModelFuture.cancel();
         m_codeModelFuture = modelmanager->updateProjectInfo(pinfo);
@@ -374,6 +392,18 @@
         setProjectLanguage(ProjectExplorer::Constants::LANG_CXX, !part->files.isEmpty());
     }
 
+    QmlJS::ModelManagerInterface *qmlModelManager = QmlJS::ModelManagerInterface::instance();
+    if (qmlModelManager) {
+        QmlJS::ModelManagerInterface::ProjectInfo qmlProjectInfo =
+                QmlJSTools::defaultProjectInfoForProject(this);
+
+        //run qml dump only if this is not a ubuntu toolchain
+        qmlProjectInfo.tryQmlDump = tc->type() != QStringLiteral("UbuntuProjectManager.UbuntuGccToolChain");
+
+        setProjectLanguage(ProjectExplorer::Constants::LANG_QMLJS,!qmlProjectInfo.sourceFiles.isEmpty());
+        qmlModelManager->updateProjectInfo(qmlProjectInfo,this);
+    }
+
     emit buildTargetsChanged();
     emit fileListChanged();
 
 
=== modified file 'src/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri'
--- src/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri	2014-06-03 10:15:38 +0000
+++ src/cmakeprojectmanager/cmakeprojectmanager_dependencies.pri	2014-09-05 11:42:10 +0000
@@ -9,6 +9,7 @@
     cpptools \
     texteditor \
     qtsupport \
-    remotelinux
+    remotelinux \
+    qmljstools
 QTC_PLUGIN_RECOMMENDS += \
     designer