Depend on the new Papyros.Core QML module instead of registering it o…

…urselves
papyros · Jan 19, 2016 · 80c97ff · 80c97ff
1 parent 119eab3
commit 80c97ff
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 81 deletions.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -5,8 +5,7 @@ target_link_libraries(papyros-terminal
                       Qt5::Core
                       Qt5::Qml
                       Qt5::Quick
-                      Qt5::Widgets
-                      Papyros::Papyros)
+                      Qt5::Widgets)
 
 install(TARGETS papyros-terminal
         DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/clipboard.cpp b/src/clipboard.cpp
diff --git a/src/clipboard.h b/src/clipboard.h
diff --git a/src/main.cpp b/src/main.cpp
@@ -20,10 +20,8 @@
 #include <QApplication>
 #include <QQmlApplicationEngine>
 #include <QQmlContext>
-#include <Papyros/KQuickConfig>
 
 #include "ActionHandler.h"
-#include "clipboard.h"
 
 int main(int argc, char *argv[])
 {
@@ -40,12 +38,6 @@ int main(int argc, char *argv[])
     // Set the X11 WML_CLASS so X11 desktops can find the desktop file
     qputenv("RESOURCE_NAME", "io.papyros.Terminal");
 
-    // TODO: Remove after we add a QML module directly to Papyros.Core
-    qmlRegisterType<KQuickConfig>("Papyros.Core", 0, 1, "KQuickConfig");
-
-    // TODO: Move this to Papyros.Core
-    qmlRegisterType<Clipboard>("Papyros.Core", 0, 1, "Clipboard");
-
     QQmlApplicationEngine engine;
 
     ActionHandler actionHandler(argv[0]);

diff --git a/src/qml/Settings.qml b/src/qml/Settings.qml
@@ -16,7 +16,7 @@
  * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
-import Papyros.Core 0.1
+import Papyros.Core 0.2
 
 KQuickConfig {
     id: settings

diff --git a/src/qml/main.qml b/src/qml/main.qml
@@ -22,7 +22,7 @@ import QtQuick.Window 2.2
 import QMLTermWidget 1.0
 import Material 0.2
 import QtQuick.Layouts 1.1
-import Papyros.Core 0.1
+import Papyros.Core 0.2
 
 ApplicationWindow {
     id: mainWindow