Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/qt4projectmanager/qt4buildconfiguration.cpp
	src/plugins/qtsupport/baseqtversion.cpp

Change-Id: Id870f70aa35c232dbbd455f83429bab80f266c2d

src/plugins/debugger/cdb/cdbengine.cpp

@@ -2626,9 +2626,7 @@ static CPlusPlus::Document::Ptr getParsedDocument(const QString &fileName,
             src = QString::fromLocal8Bit(reader.data()); // ### FIXME encoding
     }
 
-    QByteArray source = snapshot.preprocessedCode(src, fileName);
-
-    CPlusPlus::Document::Ptr doc = snapshot.documentFromSource(source, fileName);
+    CPlusPlus::Document::Ptr doc = snapshot.preprocessedDocument(src, fileName);
     doc->parse();
     return doc;
 }