Move Taction to Nootka.Music QML module

src/CMakeLists.txt

@@ -152,6 +152,9 @@ include_directories( core/music core/score )
 qt_add_qml_module(nootka
     URI "Nootka.Music"
     SOURCES
+        core/taction.cpp
+        core/taction.h
+
         core/music/tnote.h
         core/music/tnote.cpp
         core/music/trhythm.h
@@ -185,6 +188,8 @@ qt_add_qml_module(nootka
         core/score/tmelodypreview.h
         core/score/tdummychord.cpp
         core/score/tdummychord.h
+    DEPENDENCIES
+        QtQuick
 )
 
 # qmlRegisterUncreatableType<TmelodyPart>("Score", 1, 0, "TmelodyPart", QStringLiteral("You cannot create an instance of the TcommonInstrument."));

src/core/CMakeLists.txt

@@ -49,7 +49,7 @@ set(LIB_NOOTKACORE_SRC
   tpath.cpp
   tmtr.cpp
   tnootkaqml.cpp
-  taction.cpp
+  # taction.cpp
   tnoofont.cpp
 
   minizip/tzip.cpp

src/core/taction.h

@@ -19,9 +19,10 @@
 #ifndef TACTION_H
 #define TACTION_H
 
+#include "nootkacoreglobal.h"
 #include <QtCore/qobject.h>
 #include <QtGui/qcolor.h>
-#include <nootkacoreglobal.h>
+#include <QtQml/qqmlregistration.h>
 
 class QQmlComponent;
 
@@ -35,6 +36,7 @@ class QQmlComponent;
 class NOOTKACORE_EXPORT Taction : public QObject
 {
     Q_OBJECT
+    QML_ELEMENT
 
     Q_PROPERTY(QString icon READ icon WRITE setIconTag NOTIFY iconChanged)
     Q_PROPERTY(QString text READ text WRITE setText NOTIFY textChanged)

src/core/tnootkaqml.cpp

@@ -79,7 +79,6 @@ TnootkaQML::TnootkaQML(QObject *parent)
     qmlRegisterType<TpianoBg>("Nootka", 1, 0, "TpianoBg");
     qmlRegisterType<TbandoneonBg>("Nootka", 1, 0, "TbandoneonBg");
     qmlRegisterType<TsaxBg>("Nootka", 1, 0, "TsaxBg");
-    qmlRegisterType<Taction>("Nootka", 1, 0, "Taction");
 
     qmlRegisterUncreatableType<TnootkaQML>("Nootka", 1, 0, "Nootka", QStringLiteral("You cannot create an instance of the TnootkaQML."));
     qmlRegisterType<TtuneObject>("Nootka", 1, 0, "TtuneObject");

src/qml/+android/FlyItem.qml

@@ -3,6 +3,7 @@
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
 import Nootka 1.0
+import Nootka.Music
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 

src/qml/+android/MainMenuMobile.qml

@@ -3,6 +3,7 @@
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
 import Nootka 1.0
+import Nootka.Music
 import Qt5Compat.GraphicalEffects
 import QtQuick 2.12
 import QtQuick.Controls 2.12

src/qml/+android/shared/MenuButton.qml

@@ -4,7 +4,7 @@
 
 import QtQuick 2.12
 import QtQuick.Controls 2.12
-
+import Nootka.Music
 import Nootka 1.0
 
 

src/qml/about/HelpPage.qml

@@ -4,6 +4,7 @@
 
 import "../"
 import Nootka 1.0
+import Nootka.Music
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 

src/qml/shared/HeadButton.qml

@@ -3,6 +3,7 @@
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
 import Nootka 1.0
+import Nootka.Music
 import QtQuick 2.12
 import QtQuick.Controls 2.12
 

src/qml/shared/MenuButton.qml

@@ -3,6 +3,7 @@
  * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses)   */
 
 import Nootka 1.0
+import Nootka.Music
 import QtQuick 2.12
 import QtQuick.Controls 2.12