Merge remote-tracking branch 'origin/2.6'

Conflicts:
	qtcreator.qbp
	src/libs/QtcLibrary.qbs
	src/plugins/QtcPlugin.qbs
	src/tools/QtcTool.qbs

Change-Id: I3acea26888febe8f96d2131932266ed88b9f55f5

src/libs/cplusplus/cplusplus.qbs

@@ -10,10 +10,10 @@ QtcLibrary {
         "../3rdparty/cplusplus",
         "../../plugins"
     ]
-    cpp.defines: [
+    cpp.defines: base.concat([
         "NDEBUG",
         "CPLUSPLUS_BUILD_LIB"
-    ]
+    ])
     cpp.optimization: "fast"
 
     Depends { name: "cpp" }

src/libs/cplusplus/pp-engine.cpp

@@ -1297,6 +1297,8 @@ void Preprocessor::preprocess(const QString &fileName, const QByteArray &source,
     removeTrailingOutputLines();
 
     delete m_state.m_lexer;
+    while (m_state.m_tokenBuffer)
+        m_state.popTokenBuffer();
     m_state = savedState;
 
     m_env->currentFile = previousFileName;