summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitplugin.cpp
diff options
context:
space:
mode:
authorEike Ziller <eike.ziller@digia.com>2013-10-22 08:40:59 +0200
committerEike Ziller <eike.ziller@digia.com>2013-10-22 08:40:59 +0200
commit4eabcdc8fdd226eb9195b7ca3a303e052c90277c (patch)
treef3d4970c9b285a764d54b012aab6e7307a0fe93b /src/plugins/git/gitplugin.cpp
parentb8c3a79705c6504b1aeb20476794c4f1b537ec01 (diff)
parent10f42df8b3532ae71fd7d405e28614f81bcf40e7 (diff)
downloadqt-creator-4eabcdc8fdd226eb9195b7ca3a303e052c90277c.tar.gz
Merge remote-tracking branch 'origin/3.0'
Conflicts: qtcreator.pri qtcreator.qbs src/plugins/git/gitplugin.cpp src/plugins/qt4projectmanager/qmakeproject.cpp Change-Id: Icbd485214b1add7869233dfe0dd9c6a76bddfc7d
Diffstat (limited to 'src/plugins/git/gitplugin.cpp')
-rw-r--r--src/plugins/git/gitplugin.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp
index ea9bf53292..9d806d7da1 100644
--- a/src/plugins/git/gitplugin.cpp
+++ b/src/plugins/git/gitplugin.cpp
@@ -839,7 +839,7 @@ void GitPlugin::resetRepository()
QTC_ASSERT(state.hasTopLevel(), return);
QString topLevel = state.topLevel();
- LogChangeDialog dialog(true);
+ LogChangeDialog dialog(true, Core::ICore::mainWindow());
ResetItemDelegate delegate(dialog.widget());
dialog.setWindowTitle(tr("Undo Changes to %1").arg(QDir::toNativeSeparators(topLevel)));
if (dialog.runDialog(topLevel))
@@ -857,7 +857,7 @@ void GitPlugin::startRebase()
return;
if (!m_gitClient->beginStashScope(topLevel, QLatin1String("Rebase-i")))
return;
- LogChangeDialog dialog(false);
+ LogChangeDialog dialog(false, Core::ICore::mainWindow());
RebaseItemDelegate delegate(dialog.widget());
dialog.setWindowTitle(tr("Interactive Rebase"));
if (dialog.runDialog(topLevel, QString(), false))