feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/3.1'

Browse Source 
Conflicts:
	qbs/imports/QtcTool.qbs
	src/plugins/git/giteditor.cpp
	src/plugins/qmldesigner/qmldesignerplugin.cpp

Change-Id: Icafd32f713effb1479480a0d1f61a01e429fbec0
This commit is contained in:
Oswald Buddenhagen
2014-03-18 14:46:29 +01:00
parent 0d303db8c2 93184f7959
commit 868428cc63
439 changed files with 4360 additions and 2764 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/vcsbase/vcsbaseplugin.cpp
View File

@@ -633,7 +633,7 @@ void VcsBasePlugin::promptToDeleteCurrentFile()
QTC_ASSERT(state.hasFile(), return);
const bool rc = Core::VcsManager::promptToDelete(versionControl(), state.currentFile());
if (!rc)
QMessageBox::warning(0, tr("Version Control"),
QMessageBox::warning(Core::ICore::dialogParent(), tr("Version Control"),
tr("The file '%1' could not be deleted.").
arg(QDir::toNativeSeparators(state.currentFile())),
QMessageBox::Ok);