summaryrefslogtreecommitdiff
path: root/src/plugins/coreplugin/coreplugin.cpp
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2015-03-09 10:59:58 +0200
committerOrgad Shaneh <orgads@gmail.com>2015-03-09 16:10:03 +0000
commit17f2af5082f63588200eb851ff4247de509e5d1d (patch)
tree114740549fa9beb7724c00c99ffda0a395ce49df /src/plugins/coreplugin/coreplugin.cpp
parentfacc89fafd82b6a228f2608db6dde6a329f712b6 (diff)
downloadqt-creator-17f2af5082f63588200eb851ff4247de509e5d1d.tar.gz
Fix parsing of filename with position when -client is used
Instead of transforming to absolute paths in the client, pass the working directory and leave it to the target. Change-Id: I4f8724c8857e89a7ee77116c78cf8b25c56795fa Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/coreplugin/coreplugin.cpp')
-rw-r--r--src/plugins/coreplugin/coreplugin.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp
index 4246dfe729..43731dd372 100644
--- a/src/plugins/coreplugin/coreplugin.cpp
+++ b/src/plugins/coreplugin/coreplugin.cpp
@@ -226,17 +226,20 @@ bool CorePlugin::delayedInitialize()
return true;
}
-QObject *CorePlugin::remoteCommand(const QStringList & /* options */, const QStringList &args)
+QObject *CorePlugin::remoteCommand(const QStringList & /* options */,
+ const QString &workingDirectory,
+ const QStringList &args)
{
IDocument *res = m_mainWindow->openFiles(
- args, ICore::OpenFilesFlags(ICore::SwitchMode | ICore::CanContainLineNumbers));
+ args, ICore::OpenFilesFlags(ICore::SwitchMode | ICore::CanContainLineNumbers),
+ workingDirectory);
m_mainWindow->raiseWindow();
return res;
}
void CorePlugin::fileOpenRequest(const QString &f)
{
- remoteCommand(QStringList(), QStringList(f));
+ remoteCommand(QStringList(), QString(), QStringList(f));
}
ExtensionSystem::IPlugin::ShutdownFlag CorePlugin::aboutToShutdown()