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

Merge branch '2.3' into 2.4

Browse Source 
Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf
This commit is contained in:
Oswald Buddenhagen
2011-10-18 13:50:38 +02:00
parent aa95055eb0 dd324e0634
commit 0164e1bea2
22 changed files with 29650 additions and 7007 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qt4projectmanager/qt4nodes.cpp
View File

@@ -1004,7 +1004,7 @@ bool Qt4PriFileNode::priFileWritable(const QString &path)
switch (Core::FileManager::promptReadOnlyFile(path, versionControl, core->mainWindow(), false)) {
case Core::FileManager::RO_OpenVCS:
if (!versionControl->vcsOpen(path)) {
QMessageBox::warning(core->mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for edit with VCS."));
QMessageBox::warning(core->mainWindow(), tr("Cannot Open File"), tr("Cannot open the file for editing with VCS."));
return false;
}
break;