summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/coreplugin.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2013-03-11 18:15:49 +0200
committerOrgad Shaneh <orgads@gmail.com>2013-03-15 12:24:52 +0100
commit14e35b5dc4d4cc346e65d3b87940d6f584b69bb3 (patch)
tree42b4eaf7c642ba72d0196de80b682fd6717f01b4 /src/plugins/coreplugin/coreplugin.cpp
parent225c21a0f22cbba2b2dc6a4d647bea93918e3134 (diff)
downloadqt-creator-14e35b5dc4d4cc346e65d3b87940d6f584b69bb3.tar.gz
Client: Block until editor is closed
Change-Id: I06bd4425008103be3a4c8f64b6dff8f7df30c552 Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com> Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/coreplugin/coreplugin.cpp')
-rw-r--r--src/plugins/coreplugin/coreplugin.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 25ebd22851..d170ddb648 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -119,10 +119,12 @@ bool CorePlugin::delayedInitialize()
return true;
}
-void CorePlugin::remoteCommand(const QStringList & /* options */, const QStringList &args)
+QObject *CorePlugin::remoteCommand(const QStringList & /* options */, const QStringList &args)
{
- m_mainWindow->openFiles(args, Core::ICore::OpenFilesFlags(ICore::SwitchMode | ICore::CanContainLineNumbers));
+ IDocument *res = m_mainWindow->openFiles(
+ args, ICore::OpenFilesFlags(ICore::SwitchMode | ICore::CanContainLineNumbers));
m_mainWindow->activateWindow();
+ return res;
}
void CorePlugin::fileOpenRequest(const QString &f)