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

Merge remote-tracking branch 'origin/3.0'

Browse Source 
Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: I0485b1bf75cc02f9fbcb5c05e350da91f491abe3
This commit is contained in:
Eike Ziller
2013-11-25 08:57:10 +01:00
parent b75919cb89 ba03037561
commit 5e2e0e469b
41 changed files with 315 additions and 274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -1663,7 +1663,7 @@ bool ClearCasePlugin::ccFileOp(const QString &workingDir, const QString &title,
connect(buttonBox, SIGNAL(rejected()), &fileOpDlg, SLOT(reject()));
if (!fileOpDlg.exec())
return true;
return false;
QString comment = commentEdit->toPlainText();
if (m_viewData.isUcm && actSelector->changed())