From 0dc78f4436edd51a97e8b603a1730ccaba05ec4a Mon Sep 17 00:00:00 2001 From: Christian Mollekopf Date: Tue, 19 Dec 2017 15:13:29 +0100 Subject: QtWebEngine::initialize() can be replaced by setting the appropriate attribute --- applications/kube/CMakeLists.txt | 7 +------ applications/kube/main.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/applications/kube/CMakeLists.txt b/applications/kube/CMakeLists.txt index c206f22a..53556345 100644 --- a/applications/kube/CMakeLists.txt +++ b/applications/kube/CMakeLists.txt @@ -2,8 +2,7 @@ project(kube) include(ECMAddAppIcon) -find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine) -find_package(KF5 REQUIRED COMPONENTS Package) +find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick) # install executable set(SRCS main.cpp) @@ -16,11 +15,7 @@ endif() add_executable(${PROJECT_NAME} ${SRCS}) target_link_libraries(${PROJECT_NAME} - Qt5::Gui Qt5::Quick - Qt5::Widgets - Qt5::WebEngine - KF5::Package ${CMAKE_DL_LIBS} kubeframework ) diff --git a/applications/kube/main.cpp b/applications/kube/main.cpp index a7a3354e..9241d898 100644 --- a/applications/kube/main.cpp +++ b/applications/kube/main.cpp @@ -34,10 +34,11 @@ #include #include #include +#include #include #include -#include +#include #include #include "framework/src/keyring.h" @@ -137,6 +138,8 @@ int main(int argc, char *argv[]) std::signal(SIGABRT, crashHandler); std::set_terminate(terminateHandler); + //Instead of QtWebEngine::initialize(); + QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true); QApplication app(argc, argv); app.setApplicationName("kube"); app.setApplicationVersion(kube_VERSION_STRING); @@ -167,7 +170,6 @@ int main(int argc, char *argv[]) } } - QtWebEngine::initialize(); QIcon::setThemeName("kube"); QQmlApplicationEngine engine; -- cgit v1.2.3