Removed configLib.txt

Removed Qt.particles import from MusicFolderView.qml
kdchambers · Jan 26, 2020 · 0432543 · 0432543
1 parent 6fe6500
commit 0432543
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 8 deletions.
diff --git a/SaiKo.pro b/SaiKo.pro
@@ -18,8 +18,8 @@ SOURCES +=  $$SRC_PATH/main.cpp \
             $$SRC_PATH/mediafilesystem.cpp \
             $$SRC_PATH/soundstopevent.cpp \
             $$SRC_PATH/textparser.cpp \
-            src/audioplaylist.cpp \
-            src/mediadirectory.cpp
+            $$SRC_PATH/audioplaylist.cpp \
+            $$SRC_PATH/mediadirectory.cpp
 
 RESOURCES += \
     qml.qrc
@@ -40,8 +40,8 @@ HEADERS += \
     $$SRC_PATH/mediafilesystem.h \
     $$SRC_PATH/soundstopevent.h \
     $$SRC_PATH/textparser.h \
-    src/audioplaylist.h \
-    src/mediadirectory.h
+    $$SRC_PATH/audioplaylist.h \
+    $$SRC_PATH/mediadirectory.h
 
 # Image Magick
 INCLUDEPATH += $$EXTERNAL_PATH
@@ -59,6 +59,10 @@ LIBS += -lMagick++-7.Q16HDRI
 LIBS += -lMagickWand-7.Q16HDRI
 LIBS += -lMagickCore-7.Q16HDRI
 
+#LIBS += -lMagickWand
+#LIBS += -lMagickCore
+#LIBS += -lMagick++
+
 DEFINES += "DMAGICKCORE_HDRI_ENABLE=1"
 DEFINES += "MAGICKCORE_QUANTUM_DEPTH=16"
 DEFINES += "MAGICKCORE_HDRI_ENABLE=0"
@@ -67,8 +71,14 @@ DEFINES += "MAGICKCORE_HDRI_ENABLE=0"
 external_dependencies.path = bin/
 external_dependencies.files = external/*.so
 
+#qmlfiles.files = $$PWD/ui
+#qmlfiles.path = $$OUT_PWD/ui
+#INSTALLS += qmlfiles
+
 INSTALLS += external_dependencies
 
+#LIBS += $$EXTERNAL_PATH/libQt5QuickTemplates2.so
+
 LIBS += -ltag
 LIBS += -lz
 LIBS += -lIrrKlang

diff --git a/configLib.txt b/configLib.txt
diff --git a/src/main.cpp b/src/main.cpp
@@ -61,7 +61,7 @@ int main(int argc, char *argv[])
     QList<kpl::filesystem::DirectoryPath> library_roots;
     QStringList library_paths;
 
-    Options options = loadOptions("../settings.json");
+    Options options = loadOptions("./settings.json");
 
     for(const auto& lib_path : options.library_paths) {
         library_roots += *kfs::DirectoryPath::make(lib_path);
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
 
     std::cout << "Pre load" << std::endl;
 
-    engine.load(QUrl(QLatin1String("qrc:/ui/main.qml")));
+    engine.load(QUrl(QLatin1String("qrc:///ui/main.qml")));
 
     std::cout << "Post load" << std::endl;
 

diff --git a/ui/components/MusicFolderView.qml b/ui/components/MusicFolderView.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.0
 import QtQuick.Controls 2.4
-import QtQuick.Particles 2.11
 import QtQuick.Dialogs 1.3
 
 Item