Merge remote-tracking branch 'origin/3.0'

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/git/gitplugin.cpp
	src/plugins/qt4projectmanager/qmakeproject.cpp

Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d

src/plugins/qbsprojectmanager/qbsproject.cpp

@@ -286,6 +286,9 @@ void QbsProject::handleQbsParsingDone(bool success)
     delete m_qbsUpdateFutureInterface;
     m_qbsUpdateFutureInterface = 0;
 
+    if (!project.isValid())
+        return;
+
     m_rootProjectNode->update(project);
 
     updateDocuments(project.isValid() ? project.buildSystemFiles() : QSet<QString>() << m_fileName);
@@ -426,6 +429,10 @@ void QbsProject::parse(const QVariantMap &config, const Environment &env, const
             return;
     }
 
+    // Some people don't like it when files are created as a side effect of opening a project,
+    // so do not store the build graph if the build directory does not exist yet.
+    params.setDryRun(!QFileInfo(dir).exists());
+
     params.setBuildRoot(dir);
     params.setProjectFilePath(m_fileName);
     params.setIgnoreDifferentProjectFilePath(false);