diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b18543..3843295 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,377 +1,426 @@ -cmake_minimum_required(VERSION 3.0) +cmake_minimum_required(VERSION 3.12) set(REQUIRED_QT_VERSION 5.8.0) set(CMAKE_CXX_STANDARD 17) -set(MAUIKIT_VERSION 0.0.5) +set(MAUIKIT_VERSION 1.0.0) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) set(AUTOMOC_MOC_OPTIONS -Muri=org.kde.maui) set(CMAKE_INCLUDE_CURRENT_DIR ON) project(mauikit VERSION ${MAUIKIT_VERSION}) find_package(ECM 5.45.0 NO_MODULE) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR}) - + #DEFAULT COMPONENTS DEFINITIONS add_compile_definitions( -COMPONENT_EDITOR=ON -COMPONENT_FM=ON -COMPONENT_TERMINAL=ON -COMPONENT_STORE=ON -COMPONENT_TAGGING=ON -COMPONENT_SYNCING=ON -) + COMPONENT_EDITOR=ON + COMPONENT_FM=ON + COMPONENT_TERMINAL=ON + COMPONENT_STORE=ON + COMPONENT_TAGGING=ON + COMPONENT_SYNCING=ON + COMPONENT_ACCOUNTS=ON + ) include(GenerateExportHeader) include(ECMSetupVersion) include(ECMGenerateHeaders) include(CMakePackageConfigHelpers) include(ECMPoQmTools) include(ECMQMLModules) include(KDEInstallDirs) include(KDECMakeSettings) include(ECMQtDeclareLoggingCategory) include(ECMAddQch) include(KDECompilerSettings NO_POLICY_SCOPE) find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE COMPONENTS Qml Sql Core Quick Gui Svg QuickControls2 Network DBus Xml) ecm_find_qmlmodule(QtGraphicalEffects 1.0) include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src - + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils ${CMAKE_CURRENT_BINARY_DIR}/src/utils - ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/model_template - ${CMAKE_CURRENT_BINARY_DIR}/src/utils/model_template - - ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/tagging - ${CMAKE_CURRENT_BINARY_DIR}/src/utils/tagging - - ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/editor - ${CMAKE_CURRENT_BINARY_DIR}/src/utils/editor - - ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/syncing - ${CMAKE_CURRENT_BINARY_DIR}/src/utils/syncing + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/models + ${CMAKE_CURRENT_BINARY_DIR}/src/utils/models - ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/store - ${CMAKE_CURRENT_BINARY_DIR}/src/utils/store - - ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/syncing/libwebdavclient/lib - ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/syncing/libwebdavclient/lib/utils - ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/syncing/libwebdavclient/lib/dto + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/model_template + ${CMAKE_CURRENT_BINARY_DIR}/src/utils/model_template - ${CMAKE_CURRENT_SOURCE_DIR}/src/fm - ${CMAKE_CURRENT_BINARY_DIR}/src/fm - ${CMAKE_CURRENT_SOURCE_DIR}/src/kde ${CMAKE_CURRENT_BINARY_DIR}/src/kde ) set(mauikit_SRCS src/mauikit.cpp + src/utils/fmstatic.cpp src/utils/mauiapp.cpp - src/utils/mauiaccounts.cpp src/utils/handy.cpp + src/utils/models/pathlist.cpp src/utils/model_template/mauilist.cpp src/utils/model_template/mauimodel.cpp - ) + ) set(mauikit_HDRS src/mauikit.h - src/utils.h + src/utils/fmstatic.h + src/utils/fmh.h + src/utils/utils.h src/utils/handy.h + src/utils/models/pathlist.h src/utils/mauiapp.h - src/utils/mauiaccounts.h - src/utils/model_template/mauilist.h + src/utils/model_template/mauilist.h src/utils/model_template/mauimodel.h ) - - if(COMPONENT_EDITOR) - message(STATUS "INCLUDING EDITOR COMPONENT") -set(editor_SRCS - src/utils/editor/documenthandler.cpp - src/utils/editor/syntaxhighlighterutil.cpp - ) - -set(editor_HDRS - src/utils/editor/documenthandler.cpp - src/utils/editor/syntaxhighlighterutil.h - ) - endif() - -set(fm_SRCS - src/fm/fm.cpp - src/fm/fmdb.cpp - src/fm/fmlist.cpp - src/fm/placeslist.cpp - src/fm/pathlist.cpp - ) - -set(fm_HDRS - src/fm/fmh.h - src/fm/fm.h - src/fm/fmdb.h - src/fm/fmlist.h - src/fm/placeslist.h - src/fm/pathlist.h - ) -set(tagging_SRCS - src/utils/tagging/tagging.cpp - src/utils/tagging/tagdb.cpp - src/utils/tagging/tagsmodel.cpp - src/utils/tagging/tagslist.cpp - ) +if(COMPONENT_ACCOUNTS) + message(STATUS "INCLUDING ACCOUNTS COMPONENT") + + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/accounts + ${CMAKE_CURRENT_BINARY_DIR}/src/utils/accounts + ) + + set(accounts_SRCS + src/utils/accounts/mauiaccounts.cpp + src/utils/accounts/accountsdb.cpp + ) + + set(accounts_HDRS + src/utils/accounts/mauiaccounts.h + src/utils/accounts/accountsdb.h + ) + qt5_add_resources(accounts_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/accounts/accounts.qrc) + +endif() -set(tagging_HDRS - src/utils/tagging/tag.h - src/utils/tagging/tagging.h - src/utils/tagging/tagdb.h - src/utils/tagging/tagsmodel.h - src/utils/tagging/tagslist.h - ) +if(COMPONENT_EDITOR) + message(STATUS "INCLUDING EDITOR COMPONENT") + set(editor_SRCS + src/utils/editor/documenthandler.cpp + src/utils/editor/syntaxhighlighterutil.cpp + ) + + set(editor_HDRS + src/utils/editor/documenthandler.cpp + src/utils/editor/syntaxhighlighterutil.h + ) + + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/editor + ${CMAKE_CURRENT_BINARY_DIR}/src/utils/editor + ) +endif() -set(syncing_SRCS - src/utils/syncing/syncing.cpp - src/utils/syncing/libwebdavclient/lib/WebDAVClient.cpp - src/utils/syncing/libwebdavclient/lib/dto/WebDAVItem.cpp - src/utils/syncing/libwebdavclient/lib/utils/Environment.cpp - src/utils/syncing/libwebdavclient/lib/utils/NetworkHelper.cpp - src/utils/syncing/libwebdavclient/lib/utils/WebDAVReply.cpp - src/utils/syncing/libwebdavclient/lib/utils/XMLHelper.cpp - ) +if(COMPONENT_FM) + message(STATUS "INCLUDING FM COMPONENT") + + set(fm_SRCS + src/fm/fm.cpp + src/fm/fmdb.cpp + src/fm/fmlist.cpp + src/fm/placeslist.cpp + + ) + + set(fm_HDRS + src/fm/fm.h + src/fm/fmdb.h + src/fm/fmlist.h + src/fm/placeslist.h + ) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/src/fm + ${CMAKE_CURRENT_BINARY_DIR}/src/fm + ) +endif() -set(syncing_HDRS - src/utils/syncing/syncing.h - src/utils/syncing/libwebdavclient/lib/WebDAVClient.hpp - src/utils/syncing/libwebdavclient/lib/dto/WebDAVItem.hpp - src/utils/syncing/libwebdavclient/lib/utils/Environment.hpp - src/utils/syncing/libwebdavclient/lib/utils/NetworkHelper.hpp - src/utils/syncing/libwebdavclient/lib/utils/WebDAVReply.hpp - src/utils/syncing/libwebdavclient/lib/utils/XMLHelper.hpp - ) +if(COMPONENT_TAGGING) + message(STATUS "INCLUDING TAGGING COMPONENT") + set(tagging_SRCS + src/utils/tagging/tagging.cpp + src/utils/tagging/tagdb.cpp + src/utils/tagging/tagsmodel.cpp + src/utils/tagging/tagslist.cpp + ) + + set(tagging_HDRS + src/utils/tagging/tag.h + src/utils/tagging/tagging.h + src/utils/tagging/tagdb.h + src/utils/tagging/tagsmodel.h + src/utils/tagging/tagslist.h + ) + qt5_add_resources(tagging_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/tagging/tagging.qrc) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/tagging + ${CMAKE_CURRENT_BINARY_DIR}/src/utils/tagging + ) +endif() -set(store_SRCS - src/utils/store/store.cpp - src/utils/store/storemodel.cpp - src/utils/store/storelist.cpp - ) +if(COMPONENT_SYNCING) + message(STATUS "INCLUDING SYNCING COMPONENT") + set(syncing_SRCS + src/utils/syncing/syncing.cpp + src/utils/syncing/libwebdavclient/lib/WebDAVClient.cpp + src/utils/syncing/libwebdavclient/lib/dto/WebDAVItem.cpp + src/utils/syncing/libwebdavclient/lib/utils/Environment.cpp + src/utils/syncing/libwebdavclient/lib/utils/NetworkHelper.cpp + src/utils/syncing/libwebdavclient/lib/utils/WebDAVReply.cpp + src/utils/syncing/libwebdavclient/lib/utils/XMLHelper.cpp + ) + + set(syncing_HDRS + src/utils/syncing/syncing.h + src/utils/syncing/libwebdavclient/lib/WebDAVClient.hpp + src/utils/syncing/libwebdavclient/lib/dto/WebDAVItem.hpp + src/utils/syncing/libwebdavclient/lib/utils/Environment.hpp + src/utils/syncing/libwebdavclient/lib/utils/NetworkHelper.hpp + src/utils/syncing/libwebdavclient/lib/utils/WebDAVReply.hpp + src/utils/syncing/libwebdavclient/lib/utils/XMLHelper.hpp + ) + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/syncing + ${CMAKE_CURRENT_BINARY_DIR}/src/utils/syncing + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/syncing/libwebdavclient/lib + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/syncing/libwebdavclient/lib/utils + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/syncing/libwebdavclient/lib/dto + ) +endif() -set(store_HDRS - src/utils/store/store.h - src/utils/store/storemodel.h - src/utils/store/storelist.h - ) +if(COMPONENT_STORE) + message(STATUS "INCLUDING STORE COMPONENT") + set(store_SRCS + src/utils/store/store.cpp + src/utils/store/storemodel.cpp + src/utils/store/storelist.cpp + ) + + set(store_HDRS + src/utils/store/store.h + src/utils/store/storemodel.h + src/utils/store/storelist.h + ) + + qt5_add_resources(store_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/store/store.qrc) + + include_directories( + ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/store + ${CMAKE_CURRENT_BINARY_DIR}/src/utils/store + ) +endif() #use dbus on linux, bsd etc, but not andoid and apple stuff #options - for the appimage option(IS_APPIMAGE_PACKAGE "If set to true then the icons and styled is packaged as well") - -if(ANDROID OR IS_APPIMAGE_PACKAGE) - qt5_add_resources(MauiIcon_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/android/icons.qrc) + +if(ANDROID OR IS_APPIMAGE_PACKAGE OR MAUIKIT_STYLE) + qt5_add_resources(MauiIcon_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/android/icons.qrc) qt5_add_resources(MauiStyle_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/maui-style/style.qrc) - if (NOT EXISTS ${CMAKE_SOURCE_DIR}/src/android/icons/luv-icon-theme/.git) + if (NOT EXISTS ${CMAKE_SOURCE_DIR}/src/android/icons/luv-icon-theme/.git) find_package(Git REQUIRED) - execute_process(COMMAND ${GIT_EXECUTABLE} clone --depth 1 https://github.com/Nitrux/luv-icon-theme.git ${CMAKE_SOURCE_DIR}/src/android/icons/luv-icon-theme) + execute_process(COMMAND ${GIT_EXECUTABLE} clone --depth 1 https://github.com/milohr/luv-icon-theme.git ${CMAKE_SOURCE_DIR}/src/android/icons/luv-icon-theme) endif() set(mauikit_style_QRCS ${MauiIcon_RESOURCES} ${MauiStyle_RESOURCES} ) endif() if(ANDROID) find_package(Qt5 REQUIRED COMPONENTS AndroidExtras Xml WebView Network) set(MAUIANDROID_LIBS Qt5::Xml Qt5::AndroidExtras Qt5::Network Qt5::WebView ) set(mauikit_Android_SRCS src/android/mauiandroid.cpp ) else() find_package(Qt5 REQUIRED COMPONENTS WebEngine) if(COMPONENT_EDITOR) - + find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS SyntaxHighlighting) set(COMPONENT_EDITOR_LIBS - KF5::SyntaxHighlighting - ) + KF5::SyntaxHighlighting + ) endif() find_package(KF5 ${KF5_VERSION} REQUIRED COMPONENTS I18n Notifications Config Service KIO ConfigWidgets Attica) - + set(mauikit_KDE_SRCS src/kde/mauikde.cpp src/kde/kdeconnect.cpp ) - + set(mauikit_KDE_HDRS src/kde/mauikde.h src/kde/kdeconnect.h ) - + set(MAUIKDE_KF5LIBS KF5::ConfigCore KF5::Notifications KF5::I18n KF5::Service KF5::KIOCore KF5::KIOWidgets KF5::KIOFileWidgets KF5::Service KF5::KIONTLM KF5::ConfigWidgets KF5::Attica ${COMPONENT_EDITOR_LIBS} Qt5::WebEngine ) endif() qt5_add_resources(mauikit_ASSETS ${CMAKE_CURRENT_SOURCE_DIR}/assets.qrc) -qt5_add_resources(tagging_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/tagging/tagging.qrc) -qt5_add_resources(fm_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/fm/fm.qrc) -qt5_add_resources(store_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/src/utils/store/store.qrc) qt5_add_resources(mauikit_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/mauikit.qrc) add_library(MauiKit - + ${fm_HDRS} ${fm_SRCS} - ${fm_RESOURCES} - + + ${accounts_HDRS} + ${accounts_SRCS} + ${accounts_RESOURCES} + ${editor_HDRS} ${editor_SRCS} - + ${syncing_HDRS} ${syncing_SRCS} ${store_SRCS} ${store_HDRS} - ${store_RESOURCES} + ${store_RESOURCES} ${tagging_HDRS} ${tagging_SRCS} ${tagging_RESOURCES} - + ${mauikit_HDRS} ${mauikit_SRCS} ${mauikit_RESOURCES} ${mauikit_ASSETS} + ${MauiIcon_RESOURCES} ${MauiStyle_RESOURCES} - + ${mauikit_Android_SRCS} - + ${mauikit_KDE_HDRS} ${mauikit_KDE_SRCS} ) target_link_libraries(MauiKit PUBLIC Qt5::Core Qt5::Sql Qt5::Qml Qt5::Quick Qt5::QuickControls2 Qt5::Svg Qt5::Gui Qt5::Network Qt5::Xml ${MAUIKDE_KF5LIBS} ${MAUIANDROID_LIBS} ) - + if(IS_APPIMAGE_PACKAGE) target_compile_definitions(MauiKit PUBLIC APPIMAGE_PACKAGE) endif() if (ANDROID) kde_enable_exceptions(MauiKit PRIVATE) target_include_directories(MauiKit PRIVATE src/android) install(FILES src/android/mauiandroid.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/MauiKit COMPONENT Devel) - + install(DIRECTORY src/android/ DESTINATION ${KDE_INSTALL_DATAROOTDIR}/MauiKitAndroid COMPONENT Devel) endif() generate_export_header(MauiKit BASE_NAME MauiKit) install(TARGETS MauiKit EXPORT MauiKitTargets ${INSTALL_TARGETS_DEFAULT_ARGS}) target_include_directories(MauiKit INTERFACE "$") add_custom_target(copy) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/bin/org/kde/mauikit) add_custom_command(TARGET copy PRE_BUILD COMMAND ${CMAKE_COMMAND} -E copy_directory ${CMAKE_CURRENT_SOURCE_DIR}/src/controls ${CMAKE_BINARY_DIR}/bin/org/kde/mauikit/) add_dependencies(MauiKit copy) install(DIRECTORY src/controls/ DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/mauikit) install(TARGETS MauiKit DESTINATION ${KDE_INSTALL_QMLDIR}/org/kde/mauikit) install(FILES ${mauikit_HDRS} ${mauikit_KDE_HDRS} ${tagging_HDRS} ${fm_HDRS} ${syncing_HDRS} ${store_HDRS} ${CMAKE_CURRENT_BINARY_DIR}/mauikit_export.h DESTINATION ${KDE_INSTALL_INCLUDEDIR}/MauiKit COMPONENT Devel) ##INSTALL MAUI STYLE install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/maui-style DESTINATION ${KDE_INSTALL_QMLDIR}/QtQuick/Controls.2) ##CMAKE PARTS set(CMAKECONFIG_INSTALL_DIR "${KDE_INSTALL_CMAKEPACKAGEDIR}/MauiKit") ecm_setup_version(${MAUIKIT_VERSION} VARIABLE_PREFIX MAUIKIT VERSION_HEADER "${CMAKE_CURRENT_BINARY_DIR}/mauikit_version.h" PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/MauiKitConfigVersion.cmake" SOVERSION 5 ) configure_package_config_file( "${CMAKE_CURRENT_SOURCE_DIR}/MauiKitConfig.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/MauiKitConfig.cmake" INSTALL_DESTINATION ${CMAKECONFIG_INSTALL_DIR} PATH_VARS KF5_INCLUDE_INSTALL_DIR CMAKE_INSTALL_PREFIX ) install(FILES "${CMAKE_CURRENT_BINARY_DIR}/MauiKitConfig.cmake" "${CMAKE_CURRENT_BINARY_DIR}/MauiKitConfigVersion.cmake" DESTINATION "${CMAKECONFIG_INSTALL_DIR}" COMPONENT Devel ) install(EXPORT MauiKitTargets DESTINATION "${CMAKECONFIG_INSTALL_DIR}" FILE MauiKitTargets.cmake ) diff --git a/mauikit.pri b/mauikit.pri index 9308ede..6cc6445 100644 --- a/mauikit.pri +++ b/mauikit.pri @@ -1,313 +1,313 @@ QT *= \ core \ qml \ quick \ gui \ svg \ concurrent CONFIG *= c++17 DEFINES *= \ MAUI_APP \ STATIC_MAUIKIT \ ANDROID_OPENSSL \ MAUIKIT_STYLE #REPO VARIABLES LUV_REPO = https://github.com/milohr/luv-icon-theme OPENSSL_REPO = https://github.com/mauikit/openssl ATTICA_REPO = https://github.com/mauikit/attica KQUICKSYNTAXHIGHLIGHTER_REPO = https://github.com/mauikit/kquicksyntaxhighlighter.git KSYNTAXHIGHLIGHTING_REPO = https://github.com/mauikit/KSyntaxHighlighting.git #ANDROID FILES VALUES ANDROID_FILES_DIR = $$_PRO_FILE_PWD_/android_files ANDROID_FILES_MANIFEST = $$_PRO_FILE_PWD_/android_files/AndroidManifest.xml ANDROID_FILES_GRADLE = $$_PRO_FILE_PWD_/android_files/build.gradle ANDROID_FILES_RES_DIR = $$_PRO_FILE_PWD_/android_files/res linux:unix:!android { message(Building Maui helpers for Linux KDE) include($$PWD/src/kde/kde.pri) } else:android { message(Building Maui helpers for Android) include($$PWD/src/android/android.pri) contains(DEFINES, ANDROID_OPENSSL):{ exists($$PWD/src/utils/syncing/openssl/openssl.pri) { message("Using OpenSSL for Android") include($$PWD/src/utils/syncing/openssl/openssl.pri) }else { message("Getting OpenSSL for Android") system(git clone $$OPENSSL_REPO $$PWD/src/utils/syncing/openssl) include($$PWD/src/utils/syncing/openssl/openssl.pri) } } contains(DEFINES, COMPONENT_EDITOR):{ include($$PWD/src/utils/editor/syntaxhighlighter.pri) } contains(DEFINES, COMPONENT_STORE):{ exists($$PWD/src/utils/store/attica/attica.pri):{ message("Using Attica for Android") include($$PWD/src/utils/store/attica/attica.pri) }else { message("Getting Attica for Android") system(git clone $$ATTICA_REPO $$PWD/src/utils/store/attica) include($$PWD/src/utils/store/attica/attica.pri) } } contains(DEFINES, COMPONENT_SYNCING):{ include($$PWD/src/utils/syncing/libwebdavclient/webdavclient.pri) } } else { message("Unknown configuration") } contains(DEFINES, COMPONENT_TAGGING):{ message("INCLUDING TAGGING COMPONENT") include($$PWD/src/utils/tagging/tagging.pri) } else { warning("SKIPPING TAGGING COMPONENT") } contains(DEFINES, COMPONENT_EDITOR):{ message("INCLUDING EDITOR COMPONENT") HEADERS += \ $$PWD/src/utils/editor/documenthandler.h \ $$PWD/src/utils/editor/syntaxhighlighterutil.h SOURCES += \ $$PWD/src/utils//editor/documenthandler.cpp \ $$PWD/src/utils/editor/syntaxhighlighterutil.cpp INCLUDEPATH += $$PWD/src/utils/editor } else { warning("SKIPPING EDITOR COMPONENT") } contains(DEFINES, COMPONENT_STORE):{ message("INCLUDING STORE COMPONENT") HEADERS += \ $$PWD/src/utils/store/store.h \ $$PWD/src/utils/store/storemodel.h \ $$PWD/src/utils/store/storelist.h SOURCES += \ $$PWD/src/utils/store/store.cpp \ $$PWD/src/utils/store/storemodel.cpp \ $$PWD/src/utils/store/storelist.cpp RESOURCES += $$PWD/src/utils/store/store.qrc INCLUDEPATH += $$PWD/src/utils/store } else { warning("SKIPPING STORE COMPONENT") } contains(DEFINES, COMPONENT_SYNCING):{ message("INCLUDING SYNCING COMPONENT") HEADERS += $$PWD/src/utils/syncing/syncing.h SOURCES += $$PWD/src/utils/syncing/syncing.cpp INCLUDEPATH += $$PWD/src/utils/syncing } else { warning("SKIPPING SYNCING COMPONENT") } contains(DEFINES, COMPONENT_ACCOUNTS):{ message("INCLUDING ACCOUNTS COMPONENT") QT += sql HEADERS += \ $$PWD/src/utils/accounts/mauiaccounts.h \ $$PWD/src/utils/accounts/accountsdb.h \ SOURCES += \ $$PWD/src/utils/accounts/mauiaccounts.cpp\ $$PWD/src/utils/accounts/accountsdb.cpp RESOURCES += $$PWD/src/utils/accounts/accounts.qrc DISTFILES += $$PWD//src/utils/accounts/script.sql INCLUDEPATH += $$PWD/src/utils/accounts DEPENDPATH += $$PWD/src/utils/accounts } else { warning("SKIPPING ACCOUNTS COMPONENT") } contains(DEFINES, COMPONENT_FM):{ message("INCLUDING FM COMPONENT") HEADERS += \ $$PWD/src/fm/fm.h \ $$PWD/src/fm/fmlist.h \ $$PWD/src/fm/placeslist.h SOURCES += \ $$PWD/src/fm/fm.cpp \ $$PWD/src/fm/fmlist.cpp \ $$PWD/src/fm/placeslist.cpp INCLUDEPATH += $$PWD/src/fm DEPENDPATH += $$PWD/src/fm } else { warning("SKIPPING FM COMPONENT") } RESOURCES += \ $$PWD/mauikit.qrc \ $$PWD/assets.qrc \ $$PWD/maui-style/style.qrc HEADERS += \ - $$PWD/src/fm/fmstatic.h \ + $$PWD/src/utils/fmstatic.h \ $$PWD/src/mauikit.h \ $$PWD/src/utils/fmh.h \ $$PWD/src/utils/model_template/mauimodel.h \ $$PWD/src/utils/model_template/mauilist.h \ $$PWD/src/utils/handy.h \ $$PWD/src/utils/utils.h \ $$PWD/src/utils/mauiapp.h \ $$PWD/src/utils/models/pathlist.h SOURCES += \ - $$PWD/src/fm/fmstatic.cpp \ + $$PWD/src/utils/fmstatic.cpp \ $$PWD/src/mauikit.cpp \ $$PWD/src/utils/model_template/mauimodel.cpp \ $$PWD/src/utils/model_template/mauilist.cpp \ $$PWD/src/utils/handy.cpp \ $$PWD/src/utils/mauiapp.cpp \ $$PWD/src/utils/models/pathlist.cpp DEPENDPATH += \ $$PWD/src \ $$PWD/src/utils/model_template INCLUDEPATH += \ $$PWD/src \ $$PWD/src/utils \ $$PWD/src/utils/models \ $$PWD/src/utils/model_template API_VER = 1.0 DISTFILES += \ $$PWD/CMakeLists.txt #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5KIOFileWidgets.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5KIOWidgets.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5Bookmarks.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5Solid.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5XmlGui.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5IconThemes.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5KIOCore.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5JobWidgets.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5Service.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5Completion.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5ItemViews.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5ConfigWidgets.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5I18n.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5WidgetsAddons.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5Codecs.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5ConfigGui.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5ConfigCore.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libKF5ConfigCore.so #ANDROID_EXTRA_LIBS += $$PWD/libs/bin/libdbus-1.so ##KIOFileWidgets #LIBS += -L$$PWD/libs/bin/ -lKF5KIOFileWidgets #INCLUDEPATH += $$PWD/libs/includes/KIOFileWidgets #DEPENDPATH += $$PWD/libs/includes/KIOFileWidgets ##KBookmarks #LIBS += -L$$PWD/libs/bin/ -lKF5Bookmarks #INCLUDEPATH += $$PWD/libs/includes/KBookmarks #DEPENDPATH += $$PWD/libs/includes/KBookmarks ##KSolid #LIBS += -L$$PWD//libs/bin/ -lKF5Solid #INCLUDEPATH += $$PWD//libs/includes/Solid #DEPENDPATH += $$PWD/libs/includes/Solid ##KIOWidgets #LIBS += -L$$PWD/libs/bin/ -lKF5KIOWidgets #INCLUDEPATH += $$PWD/libs/includes/KIOWidgets #DEPENDPATH += $$PWD/libs/includes/KIOWidgets ##KXmlGui #LIBS += -L$$PWD/libs/bin/ -lKF5XmlGui #INCLUDEPATH += $$PWD/libs/includes/KXmlGui #DEPENDPATH += $$PWD/libs/includes/KXmlGui ##KIconThemes #LIBS += -L$$PWD/libs/bin/ -lKF5IconThemes #INCLUDEPATH += $$PWD/libs/includes/KIconThemes #DEPENDPATH += $$PWD/libs/includes/KIconThemes ##KIOCore #LIBS += -L$$PWD/libs/bin/ -lKF5KIOCore #INCLUDEPATH += $$PWD/libs/includes/KIOCore #DEPENDPATH += $$PWD/libs/includes/KIOCore ##KJobWidgets #LIBS += -L$$PWD/libs/bin/ -lKF5JobWidgets #INCLUDEPATH += $$PWD/libs/includes/KJobWidgets #DEPENDPATH += $$PWD/libs/includes/KJobWidgets ##KService #LIBS += -L$$PWD/libs/bin/ -lKF5Service #INCLUDEPATH += $$PWD/libs/includes/KService #DEPENDPATH += $$PWD/libs/includes/KService ##KCompletion #LIBS += -L$$PWD/libs/bin/ -lKF5Completion #INCLUDEPATH += $$PWD/libs/includes/KCompletion #DEPENDPATH += $$PWD/libs/includes/KCompletion ##KItemViews #LIBS += -L$$PWD/libs/bin/ -lKF5ItemViews #INCLUDEPATH += $$PWD/libs/includes/KItemViews #DEPENDPATH += $$PWD/libs/includes/KItemViews ##KConfigWidgets #LIBS += -L$$PWD/libs/bin/ -lKF5ConfigWidgets #INCLUDEPATH += $$PWD/libs/includes/KConfigWidgets #DEPENDPATH += $$PWD/libs/includes/KConfigWidgets ##KI18n #LIBS += -L$$PWD/libs/bin/ -lKF5I18n #INCLUDEPATH += $$PWD/libs/includes/KI18n #DEPENDPATH += $$PWD/libs/includes/KI18n ##KWidgetsAddons #LIBS += -L$$PWD/libs/bin/ -lKF5WidgetsAddons #INCLUDEPATH += $$PWD/libs/includes/KWidgetsAddons #DEPENDPATH += $$PWD/libs/includes/KWidgetsAddons ##KCodecs #LIBS += -L$$PWD/libs/bin/ -lKF5Codecs #INCLUDEPATH += $$PWD/libs/includes/KCodecs #DEPENDPATH += $$PWD/libs/includes/KCodecs ##KConfigGui #LIBS += -L$$PWD/libs/bin/ -lKF5ConfigGui #INCLUDEPATH += $$PWD/libs/includes/KConfigGui #DEPENDPATH += $$PWD/libs/includes/KConfigGui ##KConfigCore #LIBS += -L$$PWD/libs/bin/ -lKF5ConfigCore #INCLUDEPATH += $$PWD/libs/includes/KConfigCore #DEPENDPATH += $$PWD/libs/includes/KConfigCore diff --git a/src/fm/fmstatic.cpp b/src/utils/fmstatic.cpp similarity index 100% rename from src/fm/fmstatic.cpp rename to src/utils/fmstatic.cpp diff --git a/src/fm/fmstatic.h b/src/utils/fmstatic.h similarity index 100% rename from src/fm/fmstatic.h rename to src/utils/fmstatic.h