From 61f01c875c56438dc1843dc3b1995a0149a71975 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Sat, 1 Dec 2012 23:22:55 +0100 Subject: [PATCH 1/2] (Hopefully) fix compilation with Qt5/Mac Compilation on mac with latest qt5 fails with fatal error: 'QWebSettings' file not found The compiler call adds "include/QtWebKitWidgets" to include path, not "include/QtWebKit" . This might be a qmake related issue on mac. Attempt to fix it by adding an explicit webkit dependency. Change-Id: I032dd4dda7371a8d477f8544b0ba0004856f3d76 Reviewed-by: Pierre Rossi --- src/plugins/help/help.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/help/help.pro b/src/plugins/help/help.pro index cafc9a319b0..26aa05b25bf 100644 --- a/src/plugins/help/help.pro +++ b/src/plugins/help/help.pro @@ -4,7 +4,7 @@ TARGET = Help QT += network greaterThan(QT_MAJOR_VERSION, 4) { QT += printsupport help - !isEmpty(QT.webkitwidgets.name): QT += webkitwidgets + !isEmpty(QT.webkitwidgets.name): QT += webkitwidgets webkit else: DEFINES += QT_NO_WEBKIT } else { CONFIG += help From d80c227636fbf897d40a27b114555f55e4f2dbbf Mon Sep 17 00:00:00 2001 From: Eike Ziller Date: Fri, 30 Nov 2012 09:47:10 +0100 Subject: [PATCH 2/2] Fix opening files with file number from command line. Broke while fixing the flag handling in editor manager. Change-Id: Id743de099b3c193dcbf1dc55b4372217c691488a Reviewed-by: David Schulz --- src/plugins/coreplugin/coreplugin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/coreplugin/coreplugin.cpp b/src/plugins/coreplugin/coreplugin.cpp index 252c1a52ff5..7f2bd66a9b6 100644 --- a/src/plugins/coreplugin/coreplugin.cpp +++ b/src/plugins/coreplugin/coreplugin.cpp @@ -112,7 +112,7 @@ bool CorePlugin::delayedInitialize() 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(); }