diff options
author | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-07-13 01:02:21 +0200 |
---|---|---|
committer | Christian Mollekopf <chrigi_1@fastmail.fm> | 2016-07-14 01:23:10 +0200 |
commit | df326b81ddcafb45467c9e1e434c09e8b12a6baa (patch) | |
tree | 3b005fa68a3504f0b7454a4e1a8ef56c0dd7b9dd /applications | |
parent | 1213815b42e94f41817b79fc9e311742a330d9ae (diff) | |
download | kube-df326b81ddcafb45467c9e1e434c09e8b12a6baa.tar.gz kube-df326b81ddcafb45467c9e1e434c09e8b12a6baa.zip |
Prepared WebEngine port and resize according to content
Diffstat (limited to 'applications')
-rw-r--r-- | applications/mail/CMakeLists.txt | 6 | ||||
-rw-r--r-- | applications/mail/main.cpp | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/applications/mail/CMakeLists.txt b/applications/mail/CMakeLists.txt index 97e418b6..7c6fe755 100644 --- a/applications/mail/CMakeLists.txt +++ b/applications/mail/CMakeLists.txt | |||
@@ -18,14 +18,14 @@ include(KDEInstallDirs) | |||
18 | include(KDECMakeSettings) | 18 | include(KDECMakeSettings) |
19 | include(KDECompilerSettings) | 19 | include(KDECompilerSettings) |
20 | 20 | ||
21 | find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets) | 21 | find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui Widgets WebEngine) |
22 | 22 | ||
23 | set (QT_MIN_VERSION "5.4.0") | 23 | set (QT_MIN_VERSION "5.6.0") |
24 | find_package(KF5 REQUIRED COMPONENTS Package) | 24 | find_package(KF5 REQUIRED COMPONENTS Package) |
25 | 25 | ||
26 | # install executable | 26 | # install executable |
27 | add_executable(${PROJECT_NAME} main.cpp) | 27 | add_executable(${PROJECT_NAME} main.cpp) |
28 | qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets) | 28 | qt5_use_modules(${PROJECT_NAME} Gui Quick Widgets WebEngine) |
29 | target_link_libraries(${PROJECT_NAME} KF5::Package) | 29 | target_link_libraries(${PROJECT_NAME} KF5::Package) |
30 | 30 | ||
31 | install(TARGETS ${PROJECT_NAME} DESTINATION bin) | 31 | install(TARGETS ${PROJECT_NAME} DESTINATION bin) |
diff --git a/applications/mail/main.cpp b/applications/mail/main.cpp index 26353aa4..cb5350a2 100644 --- a/applications/mail/main.cpp +++ b/applications/mail/main.cpp | |||
@@ -5,6 +5,7 @@ | |||
5 | #include <KPackage/PackageLoader> | 5 | #include <KPackage/PackageLoader> |
6 | #include <QQuickImageProvider> | 6 | #include <QQuickImageProvider> |
7 | #include <QIcon> | 7 | #include <QIcon> |
8 | #include <QtWebEngine> | ||
8 | 9 | ||
9 | #include <QDebug> | 10 | #include <QDebug> |
10 | 11 | ||
@@ -34,6 +35,7 @@ public: | |||
34 | int main(int argc, char *argv[]) | 35 | int main(int argc, char *argv[]) |
35 | { | 36 | { |
36 | QApplication app(argc, argv); | 37 | QApplication app(argc, argv); |
38 | QtWebEngine::initialize(); | ||
37 | auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.components.mail"); | 39 | auto package = KPackage::PackageLoader::self()->loadPackage("KPackage/GenericQML", "org.kube.components.mail"); |
38 | Q_ASSERT(package.isValid()); | 40 | Q_ASSERT(package.isValid()); |
39 | QQmlApplicationEngine engine; | 41 | QQmlApplicationEngine engine; |