Merge remote branch 'origin/2.0'

Conflicts:
	doc/qtcreator.qdoc
	src/plugins/debugger/debuggermanager.cpp
	src/plugins/texteditor/basetexteditor.cpp

src/plugins/designer/formwindowfile.cpp

@@ -142,7 +142,9 @@ void FormWindowFile::reload(ReloadFlag flag, ChangeType type)
     if (type == TypePermissions) {
         emit changed();
     } else {
+        emit aboutToReload();
         emit reload(m_fileName);
+        emit reloaded();
     }
 }