Commit ee7368bf authored by Camilo higuita's avatar Camilo higuita

update qrc for deleted files

parent 43a6ea4c
......@@ -5,7 +5,7 @@ find_package(ECM 1.7.0 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake" ${ECM_MODULE_PATH})
find_package(MauiKit REQUIRED)
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Qml Quick Sql QuickControls2 Widgets)
find_package(Qt5 REQUIRED NO_MODULE COMPONENTS Qml Quick Sql Svg QuickControls2 Widgets)
include(KDEInstallDirs)
include(KDECompilerSettings NO_POLICY_SCOPE)
include(KDECMakeSettings)
......@@ -17,12 +17,16 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_AUTORCC ON)
add_executable(pix
assests.qrc
assets.qrc
main.cpp
src/db/db.cpp
src/db/db.h
src/db/dbactions.cpp
src/db/dbactions.h
src/db/fileloader.h
src/pix.cpp
src/qml.qrc
db/db.cpp
dbactions.cpp
)
if (ANDROID)
......@@ -30,13 +34,16 @@ if (ANDROID)
target_link_libraries(vvave Qt5::AndroidExtras)
kde_source_files_enable_exceptions(pix src/pix.cpp)
else()
find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config KIO)
target_link_libraries(pix KF5::ConfigCore KF5::Notifications KF5::KIOCore KF5::I18n)
endif()
if (TARGET create-apk-pix)
set_target_properties(create-apk-pix PROPERTIES ANDROID_APK_DIR "${MAUIKIT_ANDROID_DIR}")
endif()
target_link_libraries(pix Qt5::Sql Qt5::Qml Qt5::Widgets)
target_link_libraries(pix MauiKit Qt5::Sql Qt5::Qml Qt5::Widgets Qt5::Svg)
install(TARGETS pix ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
install(FILES org.kde.pix.desktop DESTINATION ${XDG_APPS_INSTALL_DIR})
......
......@@ -20,7 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QQmlApplicationEngine>
#include <QQmlContext>
#include <QQuickStyle>
// #include <QQuickStyle>
#include <QIcon>
#include <QCommandLineParser>
#include <QFileInfo>
......@@ -41,6 +41,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "./mauikit/src/mauikit.h"
#endif
#ifdef STATIC_MAUIKIT
#include "fm.h"
#include "tagging.h"
#else
#include <MauiKit/fm.h>
#include <MauiKit/tagging.h>
#endif
QStringList getFolderImages(const QString &path)
{
QStringList urls;
......
......@@ -22,8 +22,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef STATIC_MAUIKIT
#include "fm.h"
#include "tagging.h"
#else
#include <MauiKit/fm.h>
#include <MauiKit/tagging.h>
#endif
......
......@@ -24,14 +24,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <QObject>
#include "db.h"
#ifdef STATIC_MAUIKIT
#include "tagging.h"
#else
#include <MauiKit/tagging.h>
#endif
#include "../utils/pic.h"
class Tagging;
class DBActions : public DB
{
Q_OBJECT
......
......@@ -2,9 +2,6 @@
<qresource prefix="/">
<file>main.qml</file>
<file>view_models/PixGrid.qml</file>
<file>utils/Icon.qml</file>
<file>utils/Icons.js</file>
<file>utils/materialdesignicons-webfont.ttf</file>
<file>widgets/PixsBar.qml</file>
<file>db/script.sql</file>
<file>view_models/PixPic.qml</file>
......
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