From 3103389dd10c95fb47bd1828bf12fa67cfc618ef Mon Sep 17 00:00:00 2001 From: Roland Winklmeier Date: Fri, 20 Nov 2015 15:58:32 +0100 Subject: [PATCH] Make QWebEngine an opt-out for MinGW builds QWebEngine does not support MinGW compilers. In order to continue support for MinGW in swift for now, opt it out in MinGW builds. So far this affects only the news page, which is acceptable. This way we keep the advantages of Windows MinGW builds. --- src/swiftlauncher/swiftlauncher.cpp | 7 ++++++- src/swiftlauncher/swiftlauncher.pro | 5 ++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/swiftlauncher/swiftlauncher.cpp b/src/swiftlauncher/swiftlauncher.cpp index bd2723a87..b06544792 100644 --- a/src/swiftlauncher/swiftlauncher.cpp +++ b/src/swiftlauncher/swiftlauncher.cpp @@ -23,7 +23,11 @@ #include #include #include +#include + +#ifndef Q_CC_MINGW #include +#endif using namespace BlackGui; using namespace BlackCore; @@ -123,6 +127,7 @@ void CSwiftLauncher::initStyleSheet() void CSwiftLauncher::displayLatestNews() { +#ifndef Q_CC_MINGW CUrlList newsUrls(this->m_setup.get().swiftLatestNewsUrls()); QUrl newUrl(newsUrls.getNextUrl()); @@ -135,7 +140,7 @@ void CSwiftLauncher::displayLatestNews() } view->show(); **/ - +#endif } void CSwiftLauncher::initDBusGui() diff --git a/src/swiftlauncher/swiftlauncher.pro b/src/swiftlauncher/swiftlauncher.pro index ac477a4e8..a2369749e 100644 --- a/src/swiftlauncher/swiftlauncher.pro +++ b/src/swiftlauncher/swiftlauncher.pro @@ -1,6 +1,9 @@ load(common_pre) -QT += core dbus gui svg network xml multimedia webenginewidgets +QT += core dbus gui svg network xml multimedia + +# QWebEngine is not supported for MinGW +!win32-g++: QT += webenginewidgets greaterThan(QT_MAJOR_VERSION, 4): QT += widgets