Commit d23d430e authored by Camilo Higuita's avatar Camilo Higuita

update onec again

parent e8aedf0b
......@@ -11,6 +11,7 @@
#ifdef STATIC_KIRIGAMI
#include "./3rdparty/kirigami/src/kirigamiplugin.h"
#include "./mauikit/src/mauikit.h"
#endif
#ifdef Q_OS_ANDROID
......@@ -26,7 +27,7 @@
#include "services/web/youtube.h"
#include "services/web/Spotify/spotify.h"
#include "services/local/linking.h"
#include "./mauikit/src/mauikit.h"
#include "MauiKit/tagging.h"
#ifdef Q_OS_ANDROID
Q_DECL_EXPORT
......@@ -101,9 +102,11 @@ int main(int argc, char *argv[])
"LINK", // name in QML (does not have to match C++ name)
"Error: only enums" // error in case someone tries to create a MyNamespace object
);
auto tag = Tagging::getInstance(BAE::App, BAE::Version, "org.kde.vvave");
#ifdef STATIC_KIRIGAMI
KirigamiPlugin::getInstance().registerTypes();
MauiKit::getInstance().registerTypes();
#endif
#ifdef Q_OS_ANDROID
......@@ -117,8 +120,6 @@ int main(int argc, char *argv[])
QtWebEngine::initialize();
#endif
MauiKit::getInstance().registerTypes();
engine.load(QUrl(QStringLiteral("qrc:/main.qml")));
if (engine.rootObjects().isEmpty())
return -1;
......
......@@ -28,7 +28,7 @@ import "utils/Help.js" as H
import "utils/Player.js" as Player
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Maui.ApplicationWindow
{
......
......@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../utils"
import "../../widgets/PlaylistsView"
import "../../view_models"
......
......@@ -9,7 +9,7 @@ import "../../db/Queries.js" as Q
import Link.Codes 1.0
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
ColumnLayout
{
......
......@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
import "../../../view_models"
import "../../../view_models/BabeTable"
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Page
{
......
......@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
import "../../view_models"
import "../../view_models/BabeTable"
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Page
{
......
......@@ -4,7 +4,7 @@ import QtQuick.Layouts 1.3
import "../../view_models"
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Page
{
......
......@@ -13,11 +13,10 @@
#include <QScreen>
#include <QtNetwork>
#include <QEventLoop>
#include "../mauikit/src/fm/fmh.h"
//#include "../mauikit/src/fm/fmh.h"
#include "MauiKit/fmh.h"
#include <cmath>
#define BABE_MAJOR_VERSION 0
#define BABE_MINOR_VERSION 1
#define BABE_PATCH_VERSION 0
......
......@@ -2,7 +2,7 @@ import QtQuick.Controls 2.2
import QtQuick 2.9
import ".."
import org.kde.kirigami 2.0 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Maui.Page
{
......
......@@ -3,7 +3,7 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import org.kde.kirigami 2.2 as Kirigami
import QtQuick.Controls.Material 2.1
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Maui.Page
{
......
......@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../utils/Player.js" as Player
import "../../utils/Help.js" as H
import "../../db/Queries.js" as Q
......
import QtQuick 2.9
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import QtQuick.Layouts 1.3
import "../../view_models/BabeMenu"
......
import QtQuick 2.0
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import QtQuick.Layouts 1.3
import "../../view_models/BabeDialog"
......
......@@ -4,7 +4,7 @@ import QtQuick.Controls 2.3
import QtGraphicalEffects 1.0
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../view_models"
import "../../utils/Help.js" as H
......
......@@ -6,7 +6,7 @@ import "../../view_models/BabeMenu"
import "../../utils"
import ".."
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
BabeMenu
{
......
......@@ -21,16 +21,17 @@ linux:unix:!android {
} else:android {
message(Building helpers for Android)
include($$PWD/3rdparty/kirigami/kirigami.pri)
include($$PWD/mauikit/mauikit.pri)
include($$PWD/android/android.pri)
include($$PWD/3rdparty/taglib.pri)
include($$PWD/android-openssl.pri)
DEFINES += STATIC_KIRIGAMI
} else {
message("Unknown configuration")
}
include(mauikit/mauikit.pri)
include(pulpo/pulpo.pri)
# The following define makes your compiler emit warnings if you use
......@@ -127,3 +128,6 @@ HEADERS += \
# message("Linux")
# QMAKE_POST_LINK += $$copyToBuilddir($$PWD/library/cat)
#}
unix:!macx: LIBS += -lMauiKit
......@@ -8,7 +8,7 @@ import "../view_models/BabeTable"
import "../db/Queries.js" as Q
import "../utils/Help.js" as H
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Kirigami.PageRow
......
import QtQuick 2.0
import QtQuick.Controls 2.2
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../view_models/BabeTable"
import "../db/Queries.js" as Q
......
......@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../view_models"
Page
......
......@@ -3,7 +3,7 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../InfoView"
......
......@@ -2,7 +2,7 @@ import QtQuick 2.0
import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
Maui.Page
{
......
......@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../view_models/BabeTable"
import "../../view_models/BabeMenu"
......
......@@ -2,7 +2,7 @@ import QtQuick 2.9
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../utils"
......
import QtQuick 2.0
import QtQuick.Controls 2.2
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../view_models"
import "../../db/Queries.js" as Q
......
import QtQuick 2.9
import QtQuick.Controls 2.2
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import QtQuick.Layouts 1.3
import "../../view_models"
import QtGraphicalEffects 1.0
......
......@@ -3,7 +3,7 @@ import QtQuick.Controls 2.2
import QtQuick.Layouts 1.3
import QtQuick.Controls.Material 2.1
import org.kde.kirigami 2.2 as Kirigami
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../view_models"
BabePopup
......
import QtQuick 2.9
import QtQuick.Layouts 1.3
import QtQuick.Controls 2.2
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../../view_models"
import "../../view_models/BabeDialog"
......
import QtQuick 2.9
import org.kde.maui 1.0 as Maui
import org.kde.mauikit 1.0 as Maui
import "../view_models/BabeTable"
import "../view_models"
import "../db/Queries.js" as Q
......
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