summaryrefslogtreecommitdiffstats
path: root/applications
diff options
context:
space:
mode:
authorChristian Mollekopf <chrigi_1@fastmail.fm>2017-12-19 15:13:29 +0100
committerChristian Mollekopf <chrigi_1@fastmail.fm>2017-12-19 15:13:29 +0100
commit0dc78f4436edd51a97e8b603a1730ccaba05ec4a (patch)
tree74bc537f264aee9f3321d4b238cc566747c46f82 /applications
parent2d5f37460b70715c5ffd0fc6b4dc8b0975ed0cc5 (diff)
downloadkube-0dc78f4436edd51a97e8b603a1730ccaba05ec4a.tar.gz
kube-0dc78f4436edd51a97e8b603a1730ccaba05ec4a.zip
QtWebEngine::initialize() can be replaced by setting the appropriate
attribute
Diffstat (limited to 'applications')
-rw-r--r--applications/kube/CMakeLists.txt7
-rw-r--r--applications/kube/main.cpp6
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)
2 2
3include(ECMAddAppIcon) 3include(ECMAddAppIcon)
4 4
5find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine) 5find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Quick)
6find_package(KF5 REQUIRED COMPONENTS Package)
7 6
8# install executable 7# install executable
9set(SRCS main.cpp) 8set(SRCS main.cpp)
@@ -16,11 +15,7 @@ endif()
16 15
17add_executable(${PROJECT_NAME} ${SRCS}) 16add_executable(${PROJECT_NAME} ${SRCS})
18target_link_libraries(${PROJECT_NAME} 17target_link_libraries(${PROJECT_NAME}
19 Qt5::Gui
20 Qt5::Quick 18 Qt5::Quick
21 Qt5::Widgets
22 Qt5::WebEngine
23 KF5::Package
24 ${CMAKE_DL_LIBS} 19 ${CMAKE_DL_LIBS}
25 kubeframework 20 kubeframework
26) 21)
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 @@
34#include <QQmlApplicationEngine> 34#include <QQmlApplicationEngine>
35#include <QCommandLineParser> 35#include <QCommandLineParser>
36#include <QJsonDocument> 36#include <QJsonDocument>
37#include <QJsonObject>
37#include <QFileInfo> 38#include <QFileInfo>
38 39
39#include <QIcon> 40#include <QIcon>
40#include <QtWebEngine> 41#include <QFont>
41 42
42#include <QDebug> 43#include <QDebug>
43#include "framework/src/keyring.h" 44#include "framework/src/keyring.h"
@@ -137,6 +138,8 @@ int main(int argc, char *argv[])
137 std::signal(SIGABRT, crashHandler); 138 std::signal(SIGABRT, crashHandler);
138 std::set_terminate(terminateHandler); 139 std::set_terminate(terminateHandler);
139 140
141 //Instead of QtWebEngine::initialize();
142 QCoreApplication::setAttribute(Qt::AA_ShareOpenGLContexts, true);
140 QApplication app(argc, argv); 143 QApplication app(argc, argv);
141 app.setApplicationName("kube"); 144 app.setApplicationName("kube");
142 app.setApplicationVersion(kube_VERSION_STRING); 145 app.setApplicationVersion(kube_VERSION_STRING);
@@ -167,7 +170,6 @@ int main(int argc, char *argv[])
167 } 170 }
168 } 171 }
169 172
170 QtWebEngine::initialize();
171 QIcon::setThemeName("kube"); 173 QIcon::setThemeName("kube");
172 174
173 QQmlApplicationEngine engine; 175 QQmlApplicationEngine engine;