Merge remote-tracking branch 'origin/4.4'

Change-Id: Ic9a1cf3b40b259d9c77f2f542405d189171e0fbf

src/plugins/autotoolsprojectmanager/autotoolsproject.cpp

@@ -276,8 +276,10 @@ void AutotoolsProject::updateCppCodeModel()
 
     CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt;
     if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k)) {
-        if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+        if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6))
-            activeQtVersion = CppTools::ProjectPart::Qt4;
+            activeQtVersion = CppTools::ProjectPart::Qt4_8_6AndOlder;
+        else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+            activeQtVersion = CppTools::ProjectPart::Qt4Latest;
         else
             activeQtVersion = CppTools::ProjectPart::Qt5;
     }

src/plugins/cmakeprojectmanager/cmakeproject.cpp

@@ -164,8 +164,10 @@ void CMakeProject::updateProjectData(CMakeBuildConfiguration *bc)
 
     CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt;
     if (QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k)) {
-        if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+        if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6))
-            activeQtVersion = CppTools::ProjectPart::Qt4;
+            activeQtVersion = CppTools::ProjectPart::Qt4_8_6AndOlder;
+        else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+            activeQtVersion = CppTools::ProjectPart::Qt4Latest;
         else
             activeQtVersion = CppTools::ProjectPart::Qt5;
     }

src/plugins/cpptools/cppcodemodelinspectordumper.cpp

@@ -144,7 +144,8 @@ QString Utils::toString(ProjectPart::QtVersion qtVersion)
     switch (qtVersion) {
     CASE_QTVERSION(UnknownQt);
     CASE_QTVERSION(NoQt);
-    CASE_QTVERSION(Qt4);
+    CASE_QTVERSION(Qt4_8_6AndOlder);
+    CASE_QTVERSION(Qt4Latest);
     CASE_QTVERSION(Qt5);
     // no default to get a compiler warning if anything is added
     }

src/plugins/cpptools/cppprojectinfogenerator.cpp

@@ -205,12 +205,15 @@ void ProjectInfoGenerator::createProjectParts(const RawProjectPart &rawProjectPa
         const ProjectPart::Ptr part = projectPartFromRawProjectPart(rawProjectPart,
                                                                     m_projectUpdateInfo.project);
 
+        ProjectPart::LanguageVersion defaultVersion = ProjectPart::LatestCxxVersion;
+        if (rawProjectPart.qtVersion == ProjectPart::Qt4_8_6AndOlder)
+            defaultVersion = ProjectPart::CXX11;
         if (cat.hasCxxSources()) {
             createProjectPart(rawProjectPart,
                               part,
                               cat.cxxSources(),
                               cat.partName("C++"),
-                              ProjectPart::LatestCxxVersion,
+                              defaultVersion,
                               ProjectPart::NoExtensions);
         }
 
@@ -219,7 +222,7 @@ void ProjectInfoGenerator::createProjectParts(const RawProjectPart &rawProjectPa
                               part,
                               cat.objcxxSources(),
                               cat.partName("Obj-C++"),
-                              ProjectPart::LatestCxxVersion,
+                              defaultVersion,
                               ProjectPart::ObjectiveCExtensions);
         }
 

src/plugins/cpptools/projectpart.h

@@ -80,7 +80,8 @@ public:
     enum QtVersion {
         UnknownQt = -1,
         NoQt,
-        Qt4,
+        Qt4_8_6AndOlder,
+        Qt4Latest,
         Qt5
     };
 

src/plugins/genericprojectmanager/genericproject.cpp

@@ -433,8 +433,10 @@ void GenericProject::refreshCppCodeModel()
     CppTools::ProjectPart::QtVersion activeQtVersion = CppTools::ProjectPart::NoQt;
     if (QtSupport::BaseQtVersion *qtVersion =
             QtSupport::QtKitInformation::qtVersion(activeTarget()->kit())) {
-        if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+        if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6))
-            activeQtVersion = CppTools::ProjectPart::Qt4;
+            activeQtVersion = CppTools::ProjectPart::Qt4_8_6AndOlder;
+        else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+            activeQtVersion = CppTools::ProjectPart::Qt4Latest;
         else
             activeQtVersion = CppTools::ProjectPart::Qt5;
     }

src/plugins/projectexplorer/gcctoolchain.cpp

@@ -650,14 +650,26 @@ ToolChain::SystemHeaderPathsRunner GccToolChain::createSystemHeaderPathsRunner()
             (const QStringList &cxxflags, const QString &sysRoot) {
         // Prepare arguments
         QStringList arguments;
-        if (!sysRoot.isEmpty())
+        const bool hasKitSysroot = !sysRoot.isEmpty();
+        if (hasKitSysroot)
             arguments.append(QString::fromLatin1("--sysroot=%1").arg(sysRoot));
 
         QStringList flags;
         flags << platformCodeGenFlags << cxxflags;
-        foreach (const QString &a, flags) {
+        for (int i = 0; i < flags.size(); ++i) {
-            if (a.startsWith("-stdlib=") || a.startsWith("--gcctoolchain="))
+            const QString &flag = flags.at(i);
-                arguments << a;
+            if (flag.startsWith("-stdlib=") || flag.startsWith("--gcctoolchain=")) {
+                arguments << flag;
+            } else if (!hasKitSysroot) {
+                // pass build system's sysroot to compiler, if we didn't pass one from kit
+                if (flag.startsWith("--sysroot=")) {
+                    arguments << flag;
+                } else if ((flag.startsWith("-isysroot") || flag.startsWith("--sysroot"))
+                           && i < flags.size() - 1) {
+                    arguments << flag << flags.at(i + 1);
+                    ++i;
+                }
+            }
         }
 
         arguments << "-xc++" << "-E" << "-v" << "-";

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -916,8 +916,10 @@ void QbsProject::updateCppCodeModel()
 
     CppTools::ProjectPart::QtVersion qtVersionFromKit = CppTools::ProjectPart::NoQt;
     if (qtVersion) {
-        if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+        if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6))
-            qtVersionFromKit = CppTools::ProjectPart::Qt4;
+            qtVersionFromKit = CppTools::ProjectPart::Qt4_8_6AndOlder;
+        else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+            qtVersionFromKit = CppTools::ProjectPart::Qt4Latest;
         else
             qtVersionFromKit = CppTools::ProjectPart::Qt5;
     }

src/plugins/qmakeprojectmanager/qmakeproject.cpp

@@ -271,8 +271,10 @@ void QmakeProject::updateCppCodeModel()
     QtSupport::BaseQtVersion *qtVersion = QtSupport::QtKitInformation::qtVersion(k);
     ProjectPart::QtVersion qtVersionForPart = ProjectPart::NoQt;
     if (qtVersion) {
-        if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+        if (qtVersion->qtVersion() <= QtSupport::QtVersionNumber(4,8,6))
-            qtVersionForPart = ProjectPart::Qt4;
+            qtVersionForPart = ProjectPart::Qt4_8_6AndOlder;
+        else if (qtVersion->qtVersion() < QtSupport::QtVersionNumber(5,0,0))
+            qtVersionForPart = ProjectPart::Qt4Latest;
         else
             qtVersionForPart = ProjectPart::Qt5;
     }

src/plugins/scxmleditor/plugin_interface/connectableitem.cpp

@@ -230,6 +230,7 @@ bool ConnectableItem::sceneEventFilter(QGraphicsItem *watched, QEvent *event)
             else
                 newTag = new ScxmlTag(Transition, tag()->document());
             newTag->setAttribute("type", "external");
+            newTag->setAttribute("event", tag()->document()->nextUniqueId("Transition"));
             m_newTransition->init(newTag);
 
             tag()->document()->addTag(tag(), newTag);

src/plugins/scxmleditor/plugin_interface/scxmltag.cpp

@@ -168,9 +168,6 @@ void ScxmlTag::initId()
         case History:
             setAttribute("id", m_document->nextUniqueId("History"));
             break;
-        case Transition:
-            setAttribute("event", m_document->nextUniqueId("Transition"));
-            break;
         case Final:
             setAttribute("id", m_document->nextUniqueId("Final"));
             break;