Commit 62623c00 authored by Camilo Higuita's avatar Camilo Higuita

Merge branch 'master' of git.kde.org:vvave

parents 23694c67 753b88e4
...@@ -10,8 +10,11 @@ ...@@ -10,8 +10,11 @@
#include <QStyleHints> #include <QStyleHints>
#include "services/local/linking.h" #include "services/local/linking.h"
#ifdef Q_OS_ANDROID #ifdef STATIC_KIRIGAMI
#include "./3rdparty/kirigami/src/kirigamiplugin.h" #include "./3rdparty/kirigami/src/kirigamiplugin.h"
#endif
#ifdef Q_OS_ANDROID
#include <QtWebView/QtWebView> #include <QtWebView/QtWebView>
#else #else
#include <QtWebEngine> #include <QtWebEngine>
...@@ -83,9 +86,11 @@ int main(int argc, char *argv[]) ...@@ -83,9 +86,11 @@ int main(int argc, char *argv[])
"LINK", // name in QML (does not have to match C++ name) "LINK", // name in QML (does not have to match C++ name)
"Error: only enums" // error in case someone tries to create a MyNamespace object "Error: only enums" // error in case someone tries to create a MyNamespace object
); );
#ifdef STATIC_KIRIGAMI
#ifdef Q_OS_ANDROID
KirigamiPlugin::getInstance().registerTypes(); KirigamiPlugin::getInstance().registerTypes();
#endif
#ifdef Q_OS_ANDROID
QtWebView::initialize(); QtWebView::initialize();
#else #else
// if(QQuickStyle::availableStyles().contains("nomad")) // if(QQuickStyle::availableStyles().contains("nomad"))
......
...@@ -29,6 +29,7 @@ linux:unix:!android { ...@@ -29,6 +29,7 @@ linux:unix:!android {
include(3rdparty/kirigami/kirigami.pri) include(3rdparty/kirigami/kirigami.pri)
RESOURCES += kirigami-icons.qrc RESOURCES += kirigami-icons.qrc
DEFINES += STATIC_KIRIGAMI
} else { } else {
message("Unknown configuration") message("Unknown configuration")
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment