summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--applications/kube-mail/CMakeLists.txt4
-rw-r--r--applications/kube-mail/main.cpp4
-rw-r--r--framework/mail/mailtemplates.cpp3
3 files changed, 7 insertions, 4 deletions
diff --git a/applications/kube-mail/CMakeLists.txt b/applications/kube-mail/CMakeLists.txt
index 412f835c..1b1767ed 100644
--- a/applications/kube-mail/CMakeLists.txt
+++ b/applications/kube-mail/CMakeLists.txt
@@ -17,7 +17,7 @@ include(KDEInstallDirs)
17include(KDECMakeSettings) 17include(KDECMakeSettings)
18include(KDECompilerSettings) 18include(KDECompilerSettings)
19 19
20find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui) 20find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets)
21 21
22set (QT_MIN_VERSION "5.4.0") 22set (QT_MIN_VERSION "5.4.0")
23find_package(KF5 REQUIRED COMPONENTS Package) 23find_package(KF5 REQUIRED COMPONENTS Package)
@@ -27,7 +27,7 @@ kpackage_install_package(package org.kde.kube.mail "genericqml")
27 27
28# install executable 28# install executable
29add_executable(${PROJECT_NAME} main.cpp) 29add_executable(${PROJECT_NAME} main.cpp)
30qt5_use_modules(${PROJECT_NAME} Gui Quick) 30qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets)
31target_link_libraries(${PROJECT_NAME} KF5::Package) 31target_link_libraries(${PROJECT_NAME} KF5::Package)
32 32
33install(TARGETS ${PROJECT_NAME} DESTINATION bin) 33install(TARGETS ${PROJECT_NAME} DESTINATION bin)
diff --git a/applications/kube-mail/main.cpp b/applications/kube-mail/main.cpp
index 5efe14ff..1ff4effb 100644
--- a/applications/kube-mail/main.cpp
+++ b/applications/kube-mail/main.cpp
@@ -1,4 +1,4 @@
1#include <QGuiApplication> 1#include <QApplication>
2#include <QQmlApplicationEngine> 2#include <QQmlApplicationEngine>
3 3
4#include <QStandardPaths> 4#include <QStandardPaths>
@@ -33,7 +33,7 @@ public:
33 33
34int main(int argc, char *argv[]) 34int main(int argc, char *argv[])
35{ 35{
36 QGuiApplication app(argc, argv); 36 QApplication app(argc, argv);
37 auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kde.kube.mail"); 37 auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kde.kube.mail");
38 Q_ASSERT(package.isValid()); 38 Q_ASSERT(package.isValid());
39 QQmlApplicationEngine engine; 39 QQmlApplicationEngine engine;
diff --git a/framework/mail/mailtemplates.cpp b/framework/mail/mailtemplates.cpp
index 7cbd887f..e5ee8533 100644
--- a/framework/mail/mailtemplates.cpp
+++ b/framework/mail/mailtemplates.cpp
@@ -28,6 +28,7 @@
28#include <QWebFrame> 28#include <QWebFrame>
29#include <QSysInfo> 29#include <QSysInfo>
30#include <QTextCodec> 30#include <QTextCodec>
31#include <QApplication>
31 32
32#include <KCodecs/KCharsets> 33#include <KCodecs/KCharsets>
33#include <KMime/Types> 34#include <KMime/Types>
@@ -366,6 +367,8 @@ QString htmlMessageText(MessageViewer::ObjectTreeParser &otp, bool aStripSignatu
366 htmlElement = QStringLiteral("<html><head></head><body>%1</body></html>\n").arg(htmlReplace); 367 htmlElement = QStringLiteral("<html><head></head><body>%1</body></html>\n").arg(htmlReplace);
367 } 368 }
368 369
370 //QWebPage relies on this
371 Q_ASSERT(QApplication::style());
369 QWebPage page; 372 QWebPage page;
370 page.settings()->setAttribute(QWebSettings::JavascriptEnabled, false); 373 page.settings()->setAttribute(QWebSettings::JavascriptEnabled, false);
371 page.settings()->setAttribute(QWebSettings::JavaEnabled, false); 374 page.settings()->setAttribute(QWebSettings::JavaEnabled, false);