diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-12-02 22:07:22 +0200 |
|---|---|---|
| committer | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2018-12-03 09:56:07 +0200 |
| commit | 7096649fc267e3b12989f723d4e5cb7ae7b7c958 (patch) | |
| tree | 3e689cae9d803037fa744c0655389486cb6b05b1 /src/plugins/git/gerrit | |
| parent | c9a48ad5b1e1eae4d9162ea0158b18ac1ed592e7 (diff) | |
| parent | f0226d9644e7936cc12109448490047ae52bc320 (diff) | |
Merge remote-tracking branch 'origin/4.8'
Change-Id: I5b18233936e3b2cd674df92a694ba73b5a3ed752
Diffstat (limited to 'src/plugins/git/gerrit')
| -rw-r--r-- | src/plugins/git/gerrit/gerritplugin.cpp | 8 | ||||
| -rw-r--r-- | src/plugins/git/gerrit/gerritserver.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 036505dc99f..3cc82f5c459 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -317,11 +317,11 @@ void GerritPlugin::addToLocator(CommandLocator *locator) void GerritPlugin::push(const QString &topLevel) { // QScopedPointer is required to delete the dialog when leaving the function - GerritPushDialog dialog(topLevel, m_reviewers, m_parameters, ICore::mainWindow()); + GerritPushDialog dialog(topLevel, m_reviewers, m_parameters, ICore::dialogParent()); const QString initErrorMessage = dialog.initErrorMessage(); if (!initErrorMessage.isEmpty()) { - QMessageBox::warning(ICore::mainWindow(), tr("Initialization Failed"), initErrorMessage); + QMessageBox::warning(ICore::dialogParent(), tr("Initialization Failed"), initErrorMessage); return; } @@ -348,7 +348,7 @@ void GerritPlugin::openView() if (!ICore::showOptionsDialog("Gerrit")) return; } - GerritDialog *gd = new GerritDialog(m_parameters, m_server, currentRepository(), ICore::mainWindow()); + GerritDialog *gd = new GerritDialog(m_parameters, m_server, currentRepository(), ICore::dialogParent()); gd->setModal(false); connect(gd, &GerritDialog::fetchDisplay, this, [this](const QSharedPointer<GerritChange> &change) { fetch(change, FetchDisplay); }); @@ -431,7 +431,7 @@ void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode) if (!verifiedRepository) { QMessageBox::StandardButton answer = QMessageBox::question( - ICore::mainWindow(), tr("Remote Not Verified"), + ICore::dialogParent(), tr("Remote Not Verified"), tr("Change host %1\nand project %2\n\nwere not verified among remotes" " in %3. Select different folder?") .arg(m_server->host, diff --git a/src/plugins/git/gerrit/gerritserver.cpp b/src/plugins/git/gerrit/gerritserver.cpp index e9dee455658..9e85606c76f 100644 --- a/src/plugins/git/gerrit/gerritserver.cpp +++ b/src/plugins/git/gerrit/gerritserver.cpp @@ -301,7 +301,7 @@ bool GerritServer::resolveRoot() return setupAuthentication(); case CertificateError: if (QMessageBox::question( - Core::ICore::mainWindow(), + Core::ICore::dialogParent(), QCoreApplication::translate( "Gerrit::Internal::GerritDialog", "Certificate Error"), QCoreApplication::translate( |