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

Merge remote-tracking branch 'origin/3.4'

Browse Source 
Conflicts:
	src/plugins/coreplugin/coreplugin.cpp

Change-Id: I9aa6c61412e2ef4a91efe028296bcc2d075856d7
This commit is contained in:
Eike Ziller
2015-03-11 10:35:49 +01:00
parent adf70c1a84 b201c9be2b
commit 23ec56516e
118 changed files with 2364 additions and 2597 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/coreplugin/coreplugin.cpp
View File

@@ -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::CanContainLineAndColumnNumbers));
args, ICore::OpenFilesFlags(ICore::SwitchMode | ICore::CanContainLineAndColumnNumbers),
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()