diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/CMakeLists.txt | 22 | ||||
| -rw-r--r-- | src/gui/main.cpp | 5 |
2 files changed, 4 insertions, 23 deletions
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 43c283d04..b87a44404 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -186,28 +186,8 @@ set_target_properties(owncloud PROPERTIES AUTOUIC ON AUTORCC ON ) -target_link_libraries(owncloud owncloudCore) - - -find_package(Qt5LinguistTools) -if(Qt5LinguistTools_FOUND) - # Handle Translations, pick all client_* files from trans directory. - file(GLOB client_translations ${CMAKE_SOURCE_DIR}/translations/client_*.ts) - qt5_add_translation(client_compiled_translations ${client_translations}) - target_sources(owncloud PRIVATE ${client_compiled_translations}) - add_resources_to_target( - TARGET owncloud - PREFIX translations - FILES "${client_compiled_translations}" - ) -endif() - -#TODO Move resources files -target_sources(owncloud PRIVATE - ${PROJECT_SOURCE_DIR}/client.qrc - ${PROJECT_SOURCE_DIR}/core_theme.qrc) +target_link_libraries(owncloud owncloudCore owncloudResources) -generate_theme(owncloud OWNCLOUD_SIDEBAR_ICONS) MESSAGE(STATUS "OWNCLOUD_SIDEBAR_ICONS: ${APPLICATION_ICON_NAME}: ${OWNCLOUD_SIDEBAR_ICONS}") ecm_add_app_icon(appIcons ICONS "${OWNCLOUD_ICONS}" SIDEBAR_ICONS "${OWNCLOUD_SIDEBAR_ICONS}" OUTFILE_BASENAME "${APPLICATION_ICON_NAME}") diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 0d6e19522..dec162d04 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -18,6 +18,7 @@ #include "common/utility.h" #include "guiutility.h" #include "platform.h" +#include "resources/loadresources.h" #include "theme.h" #include "updater/updater.h" @@ -41,8 +42,8 @@ void warnSystray() int main(int argc, char **argv) { - Q_INIT_RESOURCE(client); - + // load the resources + const OCC::ResourcesLoader resource; QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps, true); // Create a `Platform` instance so it can set-up/tear-down stuff for us, and do any |