Merge remote-tracking branch 'origin/4.1'

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri
	src/plugins/qmakeprojectmanager/makestep.cpp
	src/shared/qbs

Change-Id: If1787ed23afa786ed2cef57f53c1db642559cbe0
This commit is contained in:
Eike Ziller
2016-08-31 14:40:38 +02:00
36 changed files with 488 additions and 69 deletions

View File

@@ -315,7 +315,8 @@ public:
void provideNewRange(quint64 offset)
{
openImpl(0, filePath().toString(), offset);
if (filePath().exists())
openImpl(0, filePath().toString(), offset);
}
public: