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

Merge remote-tracking branch 'origin/2.6'

Browse Source
This commit is contained in:
Eike Ziller
2012-12-03 15:46:21 +01:00
parent b8674062eb d80c227636
commit 5a10ad8078
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -112,7 +112,7 @@ bool CorePlugin::delayedInitialize()
void CorePlugin::remoteCommand(const QStringList & /* options */, const QStringList &args) void CorePlugin::remoteCommand(const QStringList & /* options */, const QStringList &args)
{ {
m_mainWindow->openFiles(args, ICore::SwitchMode); m_mainWindow->openFiles(args, Core::ICore::OpenFilesFlags(ICore::SwitchMode | ICore::CanContainLineNumbers));
m_mainWindow->activateWindow(); m_mainWindow->activateWindow();
} }

2
src/plugins/help/help.pro
View File

@@ -4,7 +4,7 @@ TARGET = Help
QT += network QT += network
greaterThan(QT_MAJOR_VERSION, 4) { greaterThan(QT_MAJOR_VERSION, 4) {
QT += printsupport help QT += printsupport help
!isEmpty(QT.webkitwidgets.name): QT += webkitwidgets !isEmpty(QT.webkitwidgets.name): QT += webkitwidgets webkit
else: DEFINES += QT_NO_WEBKIT else: DEFINES += QT_NO_WEBKIT
} else { } else {
CONFIG += help CONFIG += help