Merge "Merge remote-tracking branch 'origin/master' into 4.11" into 4.11

src/plugins/cmakeprojectmanager/cmakeconfigitem.h

@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "cmake_global.h"
+
 #include <utils/optional.h>
 
 #include <QByteArray>
@@ -40,7 +42,7 @@ class MacroExpander;
 
 namespace CMakeProjectManager {
 
-class CMakeConfigItem {
+class CMAKE_EXPORT CMakeConfigItem {
 public:
     enum Type { FILEPATH, PATH, BOOL, STRING, INTERNAL, STATIC };
     CMakeConfigItem();

src/plugins/cmakeprojectmanager/cmakekitinformation.cpp

@@ -58,7 +58,6 @@
 using namespace ProjectExplorer;
 
 namespace CMakeProjectManager {
-namespace Internal {
 // --------------------------------------------------------------------
 // CMakeKitAspect:
 // --------------------------------------------------------------------
@@ -1075,5 +1074,4 @@ KitAspectWidget *CMakeConfigurationKitAspect::createConfigWidget(Kit *k) const
     return new CMakeConfigurationKitAspectWidget(k, this);
 }
 
-} // namespace Internal
 } // namespace CMakeProjectManager

src/plugins/cmakeprojectmanager/cmakekitinformation.h

@@ -25,6 +25,8 @@
 
 #pragma once
 
+#include "cmake_global.h"
+
 #include "cmakeconfigitem.h"
 
 #include <projectexplorer/kitmanager.h>
@@ -32,9 +34,7 @@
 namespace CMakeProjectManager {
 class CMakeTool;
 
-namespace Internal {
-
-class CMakeKitAspect : public ProjectExplorer::KitAspect
+class CMAKE_EXPORT CMakeKitAspect : public ProjectExplorer::KitAspect
 {
     Q_OBJECT
 public:
@@ -58,7 +58,7 @@ public:
     QSet<Core::Id> availableFeatures(const ProjectExplorer::Kit *k) const final;
 };
 
-class CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect
+class CMAKE_EXPORT CMakeGeneratorKitAspect : public ProjectExplorer::KitAspect
 {
     Q_OBJECT
 public:
@@ -88,7 +88,7 @@ private:
     QVariant defaultValue(const ProjectExplorer::Kit *k) const;
 };
 
-class CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect
+class CMAKE_EXPORT CMakeConfigurationKitAspect : public ProjectExplorer::KitAspect
 {
     Q_OBJECT
 public:
@@ -113,5 +113,4 @@ private:
     QVariant defaultValue(const ProjectExplorer::Kit *k) const;
 };
 
-} // namespace Internal
 } // namespace CMakeProjectManager

src/plugins/qnx/qnxtoolchain.cpp

@@ -74,9 +74,12 @@ static Abis detectTargetAbis(const FilePath &sdpPath)
 
 static void setQnxEnvironment(Environment &env, const EnvironmentItems &qnxEnv)
 {
-    // We only need to set QNX_HOST and QNX_TARGET needed when running qcc
+    // We only need to set QNX_HOST, QNX_TARGET, and QNX_CONFIGURATION_EXCLUSIVE
+    // needed when running qcc
     foreach (const EnvironmentItem &item, qnxEnv) {
-        if (item.name == QLatin1String("QNX_HOST") || item.name == QLatin1String("QNX_TARGET"))
+        if (item.name == QLatin1String("QNX_HOST") ||
+            item.name == QLatin1String("QNX_TARGET") ||
+            item.name == QLatin1String("QNX_CONFIGURATION_EXCLUSIVE"))
             env.set(item.name, item.value);
     }
 }
@@ -113,7 +116,9 @@ std::unique_ptr<ToolChainConfigWidget> QnxToolChain::createConfigurationWidget()
 
 void QnxToolChain::addToEnvironment(Environment &env) const
 {
-    if (env.expandedValueForKey("QNX_HOST").isEmpty() || env.expandedValueForKey("QNX_TARGET").isEmpty())
+    if (env.expandedValueForKey("QNX_HOST").isEmpty() ||
+        env.expandedValueForKey("QNX_TARGET").isEmpty() ||
+        env.expandedValueForKey("QNX_CONFIGURATION_EXCLUSIVE").isEmpty())
         setQnxEnvironment(env, QnxUtils::qnxEnvironment(m_sdpPath));
 
     GccToolChain::addToEnvironment(env);

src/plugins/qnx/qnxutils.cpp

@@ -46,8 +46,8 @@ using namespace Qnx::Internal;
 
 namespace {
 const char *EVAL_ENV_VARS[] = {
-    "QNX_TARGET", "QNX_HOST", "QNX_CONFIGURATION", "MAKEFLAGS", "LD_LIBRARY_PATH",
-    "PATH", "QDE", "CPUVARDIR", "PYTHONPATH"
+    "QNX_TARGET", "QNX_HOST", "QNX_CONFIGURATION", "QNX_CONFIGURATION_EXCLUSIVE",
+    "MAKEFLAGS", "LD_LIBRARY_PATH", "PATH", "QDE", "CPUVARDIR", "PYTHONPATH"
 };
 }