Move resources to a shared libarywork/resources

This allows us to use resources in the cmd app and the unit tests.

Fixes: #8839

99 files changed, 139 insertions, 65 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e4c0650e2..546a5cf42 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ include(OCBundleResources)
 if (EXISTS "${PROJECT_SOURCE_DIR}/branding")
     set(OEM_THEME_DIR "${PROJECT_SOURCE_DIR}/branding" CACHE STRING "The directory containing a custom theme")
 else()
-    set(OEM_THEME_DIR "${PROJECT_SOURCE_DIR}" CACHE STRING "Define directory containing a custom theme")
+    set(OEM_THEME_DIR "${PROJECT_SOURCE_DIR}/src/resources/" CACHE STRING "Define directory containing a custom theme")
 endif()
 include("${CMAKE_CURRENT_LIST_DIR}/THEME.cmake")
 
diff --git a/client.qrc b/client.qrc
deleted file mode 100644
index 9acf066fd..000000000
--- a/client.qrc
+++ /dev/null
@@ -1,39 +0,0 @@
-<RCC>
-    <qresource prefix="/client">
-        <file alias="resources/light/folder-sync.svg">resources/font-awesome/light/folder-solid.svg</file>
-        <file alias="resources/light/settings.svg">resources/font-awesome/light/cog-solid.svg</file>
-        <file alias="resources/light/activity.svg">resources/font-awesome/light/bolt-solid.svg</file>
-        <file alias="resources/light/lock-https.svg">resources/font-awesome/light/lock-solid.svg</file>
-        <file alias="resources/light/lock-http.svg">resources/font-awesome/light/lock-open-solid.svg</file>
-        <file alias="resources/light/account.svg">resources/font-awesome/light/user-solid.svg</file>
-        <file alias="resources/light/more.svg">resources/font-awesome/light/ellipsis-h-solid.svg</file>
-        <file alias="resources/light/delete.svg">resources/font-awesome/light/trash-solid.svg</file>
-        <file alias="resources/light/bell.svg">resources/font-awesome/light/bell-solid.svg</file>
-        <file alias="resources/light/quit.svg">resources/font-awesome/light/power-off-solid.svg</file>
-        <file alias="resources/light/plus-solid.svg">resources/font-awesome/light/plus-solid.svg</file>
-        <file alias="resources/light/warning.svg">resources/font-awesome/light/exclamation-triangle-solid.svg</file>
-        <file alias="resources/light/ban.svg">resources/font-awesome/dark/ban-solid.svg</file>
-        <file alias="resources/light/check.svg">resources/font-awesome/dark/check-solid.svg</file>
-        <file alias="resources/light/step-forward.svg">resources/font-awesome/dark/step-forward-solid.svg</file>
-        <file alias="resources/light/clipboard.svg">resources/font-awesome/dark/clipboard-solid.svg</file>
-
-        <file alias="resources/dark/folder-sync.svg">resources/font-awesome/dark/folder-solid.svg</file>
-        <file alias="resources/dark/settings.svg">resources/font-awesome/dark/cog-solid.svg</file>
-        <file alias="resources/dark/activity.svg">resources/font-awesome/dark/bolt-solid.svg</file>
-        <file alias="resources/dark/lock-https.svg">resources/font-awesome/dark/lock-solid.svg</file>
-        <file alias="resources/dark/lock-http.svg">resources/font-awesome/dark/lock-open-solid.svg</file>
-        <file alias="resources/dark/account.svg">resources/font-awesome/dark/user-solid.svg</file>
-        <file alias="resources/dark/more.svg">resources/font-awesome/dark/ellipsis-h-solid.svg</file>
-        <file alias="resources/dark/delete.svg">resources/font-awesome/dark/trash-solid.svg</file>
-        <file alias="resources/dark/bell.svg">resources/font-awesome/dark/bell-solid.svg</file>
-        <file alias="resources/dark/quit.svg">resources/font-awesome/dark/power-off-solid.svg</file>
-        <file alias="resources/dark/plus-solid.svg">resources/font-awesome/dark/plus-solid.svg</file>
-        <file alias="resources/dark/warning.svg">resources/font-awesome/dark/exclamation-triangle-solid.svg</file>
-        <file alias="resources/dark/ban.svg">resources/font-awesome/dark/ban-solid.svg</file>
-        <file alias="resources/dark/check.svg">resources/font-awesome/dark/check-solid.svg</file>
-        <file alias="resources/dark/step-forward.svg">resources/font-awesome/dark/step-forward-solid.svg</file>
-        <file alias="resources/dark/clipboard.svg">resources/font-awesome/dark/clipboard-solid.svg</file>
-
-        <file alias="resources/wizard/style.qss">resources/wizard/style.qss</file>
-    </qresource>
-</RCC>
diff --git a/cmake/modules/OCBundleResources.cmake b/cmake/modules/OCBundleResources.cmake
index 86f844b93..b53620d84 100644
--- a/cmake/modules/OCBundleResources.cmake
+++ b/cmake/modules/OCBundleResources.cmake
@@ -71,7 +71,7 @@ function(__write_qrc_file_footer QRC_PATH)
 endfunction()
 
 function(generate_theme TARGET OWNCLOUD_SIDEBAR_ICONS_OUT)
-    if(NOT "${OEM_THEME_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}")
+    if(NOT "${OEM_THEME_DIR}" STREQUAL "${PROJECT_SOURCE_DIR}/src/resources/")
         set(QRC_PATH ${CMAKE_CURRENT_BINARY_DIR}/theme.qrc)
         __write_qrc_file_header(${QRC_PATH} theme)
 
@@ -89,6 +89,7 @@ function(generate_theme TARGET OWNCLOUD_SIDEBAR_ICONS_OUT)
         __write_qrc_file_footer(${QRC_PATH})
 
         target_sources(${TARGET} PRIVATE ${QRC_PATH})
+        target_compile_definitions(${TARGET} PRIVATE BRANDING_AVAILABLE)
 
         # add executable icon on windows and osx
         file(GLOB_RECURSE OWNCLOUD_SIDEBAR_ICONS "${OEM_THEME_DIR}/theme/colored/*-${APPLICATION_ICON_NAME}-sidebar.png")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 878bce1bb..e6822fbf0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -37,6 +37,7 @@ elseif(UNIX AND NOT APPLE)
   set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-z,relro -Wl,-z,now")
 endif()
 
+add_subdirectory(resources)
 add_subdirectory(csync)
 add_subdirectory(libsync)
 if (NOT BUILD_LIBRARIES_ONLY)
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 43c283d04..ba265848f 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
diff --git a/src/resources/CMakeLists.txt b/src/resources/CMakeLists.txt
new file mode 100644
index 000000000..a8281b6a0
--- /dev/null
+++ b/src/resources/CMakeLists.txt
@@ -0,0 +1,37 @@
+find_package(Qt5LinguistTools)
+
+add_library(ownCloudResources SHARED
+    client.qrc
+    core_theme.qrc
+    loadresources.cpp
+)
+
+generate_theme(ownCloudResources OWNCLOUD_SIDEBAR_ICONS)
+
+target_link_libraries(ownCloudResources PUBLIC Qt5::Core)
+
+set_target_properties(ownCloudResources PROPERTIES
+    OUTPUT_NAME "${APPLICATION_EXECUTABLE}Resources"
+    AUTOUIC ON
+    AUTORCC ON
+)
+
+GENERATE_EXPORT_HEADER(ownCloudResources
+        EXPORT_MACRO_NAME OWNCLOUDRESOURCES_EXPORT
+        EXPORT_FILE_NAME owncloudresources.h
+        STATIC_DEFINE OWNCLOUD_BUILT_AS_STATIC
+)
+
+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(ownCloudResources PRIVATE ${client_compiled_translations})
+    add_resources_to_target(
+        TARGET ownCloudResources
+        PREFIX translations
+        FILES "${client_compiled_translations}"
+    )
+endif()
+
+install(TARGETS ownCloudResources ${KDE_INSTALL_TARGETS_DEFAULT_ARGS})
\ No newline at end of file
diff --git a/src/resources/client.qrc b/src/resources/client.qrc
new file mode 100644
index 000000000..6b7b85deb
--- /dev/null
+++ b/src/resources/client.qrc
@@ -0,0 +1,39 @@
+<RCC>
+    <qresource prefix="/client">
+        <file alias="resources/light/folder-sync.svg">font-awesome/light/folder-solid.svg</file>
+        <file alias="resources/light/settings.svg">font-awesome/light/cog-solid.svg</file>
+        <file alias="resources/light/activity.svg">font-awesome/light/bolt-solid.svg</file>
+        <file alias="resources/light/lock-https.svg">font-awesome/light/lock-solid.svg</file>
+        <file alias="resources/light/lock-http.svg">font-awesome/light/lock-open-solid.svg</file>
+        <file alias="resources/light/account.svg">font-awesome/light/user-solid.svg</file>
+        <file alias="resources/light/more.svg">font-awesome/light/ellipsis-h-solid.svg</file>
+        <file alias="resources/light/delete.svg">font-awesome/light/trash-solid.svg</file>
+        <file alias="resources/light/bell.svg">font-awesome/light/bell-solid.svg</file>
+        <file alias="resources/light/quit.svg">font-awesome/light/power-off-solid.svg</file>
+        <file alias="resources/light/plus-solid.svg">font-awesome/light/plus-solid.svg</file>
+        <file alias="resources/light/warning.svg">font-awesome/light/exclamation-triangle-solid.svg</file>
+        <file alias="resources/light/ban.svg">font-awesome/dark/ban-solid.svg</file>
+        <file alias="resources/light/check.svg">font-awesome/dark/check-solid.svg</file>
+        <file alias="resources/light/step-forward.svg">font-awesome/dark/step-forward-solid.svg</file>
+        <file alias="resources/light/clipboard.svg">font-awesome/dark/clipboard-solid.svg</file>
+
+        <file alias="resources/dark/folder-sync.svg">font-awesome/dark/folder-solid.svg</file>
+        <file alias="resources/dark/settings.svg">font-awesome/dark/cog-solid.svg</file>
+        <file alias="resources/dark/activity.svg">font-awesome/dark/bolt-solid.svg</file>
+        <file alias="resources/dark/lock-https.svg">font-awesome/dark/lock-solid.svg</file>
+        <file alias="resources/dark/lock-http.svg">font-awesome/dark/lock-open-solid.svg</file>
+        <file alias="resources/dark/account.svg">font-awesome/dark/user-solid.svg</file>
+        <file alias="resources/dark/more.svg">font-awesome/dark/ellipsis-h-solid.svg</file>
+        <file alias="resources/dark/delete.svg">font-awesome/dark/trash-solid.svg</file>
+        <file alias="resources/dark/bell.svg">font-awesome/dark/bell-solid.svg</file>
+        <file alias="resources/dark/quit.svg">font-awesome/dark/power-off-solid.svg</file>
+        <file alias="resources/dark/plus-solid.svg">font-awesome/dark/plus-solid.svg</file>
+        <file alias="resources/dark/warning.svg">font-awesome/dark/exclamation-triangle-solid.svg</file>
+        <file alias="resources/dark/ban.svg">font-awesome/dark/ban-solid.svg</file>
+        <file alias="resources/dark/check.svg">font-awesome/dark/check-solid.svg</file>
+        <file alias="resources/dark/step-forward.svg">font-awesome/dark/step-forward-solid.svg</file>
+        <file alias="resources/dark/clipboard.svg">font-awesome/dark/clipboard-solid.svg</file>
+
+        <file alias="resources/wizard/style.qss">wizard/style.qss</file>
+    </qresource>
+</RCC>
diff --git a/core_theme.qrc b/src/resources/core_theme.qrc
index 1137eaeed..1137eaeed 100644
--- a/core_theme.qrc
+++ b/src/resources/core_theme.qrc
diff --git a/resources/font-awesome/LICENSE.txt b/src/resources/font-awesome/LICENSE.txt
index f31bef92b..f31bef92b 100644
--- a/resources/font-awesome/LICENSE.txt
+++ b/src/resources/font-awesome/LICENSE.txt
diff --git a/resources/font-awesome/dark/ban-solid.svg b/src/resources/font-awesome/dark/ban-solid.svg
index 991d9780b..991d9780b 100644
--- a/resources/font-awesome/dark/ban-solid.svg
+++ b/src/resources/font-awesome/dark/ban-solid.svg
diff --git a/resources/font-awesome/dark/bell-solid.svg b/src/resources/font-awesome/dark/bell-solid.svg
index e5f2f535e..e5f2f535e 100644
--- a/resources/font-awesome/dark/bell-solid.svg
+++ b/src/resources/font-awesome/dark/bell-solid.svg
diff --git a/resources/font-awesome/dark/bolt-solid.svg b/src/resources/font-awesome/dark/bolt-solid.svg
index 6aa1c1edc..6aa1c1edc 100644
--- a/resources/font-awesome/dark/bolt-solid.svg
+++ b/src/resources/font-awesome/dark/bolt-solid.svg
diff --git a/resources/font-awesome/dark/check-solid.svg b/src/resources/font-awesome/dark/check-solid.svg
index d993b404e..d993b404e 100644
--- a/resources/font-awesome/dark/check-solid.svg
+++ b/src/resources/font-awesome/dark/check-solid.svg
diff --git a/resources/font-awesome/dark/clipboard-solid.svg b/src/resources/font-awesome/dark/clipboard-solid.svg
index feb2a32a6..feb2a32a6 100644
--- a/resources/font-awesome/dark/clipboard-solid.svg
+++ b/src/resources/font-awesome/dark/clipboard-solid.svg
diff --git a/resources/font-awesome/dark/cog-solid.svg b/src/resources/font-awesome/dark/cog-solid.svg
index 956c337ca..956c337ca 100644
--- a/resources/font-awesome/dark/cog-solid.svg
+++ b/src/resources/font-awesome/dark/cog-solid.svg
diff --git a/resources/font-awesome/dark/ellipsis-h-solid.svg b/src/resources/font-awesome/dark/ellipsis-h-solid.svg
index a2e36e3c1..a2e36e3c1 100644
--- a/resources/font-awesome/dark/ellipsis-h-solid.svg
+++ b/src/resources/font-awesome/dark/ellipsis-h-solid.svg
diff --git a/resources/font-awesome/dark/exclamation-triangle-solid.svg b/src/resources/font-awesome/dark/exclamation-triangle-solid.svg
index 4d53f45aa..4d53f45aa 100644
--- a/resources/font-awesome/dark/exclamation-triangle-solid.svg
+++ b/src/resources/font-awesome/dark/exclamation-triangle-solid.svg
diff --git a/resources/font-awesome/dark/folder-solid.svg b/src/resources/font-awesome/dark/folder-solid.svg
index 7642e349f..7642e349f 100644
--- a/resources/font-awesome/dark/folder-solid.svg
+++ b/src/resources/font-awesome/dark/folder-solid.svg
diff --git a/resources/font-awesome/dark/lock-open-solid.svg b/src/resources/font-awesome/dark/lock-open-solid.svg
index c3a547e24..c3a547e24 100644
--- a/resources/font-awesome/dark/lock-open-solid.svg
+++ b/src/resources/font-awesome/dark/lock-open-solid.svg
diff --git a/resources/font-awesome/dark/lock-solid.svg b/src/resources/font-awesome/dark/lock-solid.svg
index 94c5e7d77..94c5e7d77 100644
--- a/resources/font-awesome/dark/lock-solid.svg
+++ b/src/resources/font-awesome/dark/lock-solid.svg
diff --git a/resources/font-awesome/dark/plus-solid.svg b/src/resources/font-awesome/dark/plus-solid.svg
index 44e1f858b..44e1f858b 100644
--- a/resources/font-awesome/dark/plus-solid.svg
+++ b/src/resources/font-awesome/dark/plus-solid.svg
diff --git a/resources/font-awesome/dark/power-off-solid.svg b/src/resources/font-awesome/dark/power-off-solid.svg
index 28baa2ec9..28baa2ec9 100644
--- a/resources/font-awesome/dark/power-off-solid.svg
+++ b/src/resources/font-awesome/dark/power-off-solid.svg
diff --git a/resources/font-awesome/dark/step-forward-solid.svg b/src/resources/font-awesome/dark/step-forward-solid.svg
index c8223718b..c8223718b 100644
--- a/resources/font-awesome/dark/step-forward-solid.svg
+++ b/src/resources/font-awesome/dark/step-forward-solid.svg
diff --git a/resources/font-awesome/dark/trash-solid.svg b/src/resources/font-awesome/dark/trash-solid.svg
index 2190928cf..2190928cf 100644
--- a/resources/font-awesome/dark/trash-solid.svg
+++ b/src/resources/font-awesome/dark/trash-solid.svg
diff --git a/resources/font-awesome/dark/user-solid.svg b/src/resources/font-awesome/dark/user-solid.svg
index 5a4de015c..5a4de015c 100644
--- a/resources/font-awesome/dark/user-solid.svg
+++ b/src/resources/font-awesome/dark/user-solid.svg
diff --git a/resources/font-awesome/light/ban-solid.svg b/src/resources/font-awesome/light/ban-solid.svg
index e0cd45dd9..e0cd45dd9 100644
--- a/resources/font-awesome/light/ban-solid.svg
+++ b/src/resources/font-awesome/light/ban-solid.svg
diff --git a/resources/font-awesome/light/bell-solid.svg b/src/resources/font-awesome/light/bell-solid.svg
index 57216ba94..57216ba94 100644
--- a/resources/font-awesome/light/bell-solid.svg
+++ b/src/resources/font-awesome/light/bell-solid.svg
diff --git a/resources/font-awesome/light/bolt-solid.svg b/src/resources/font-awesome/light/bolt-solid.svg
index 04351727e..04351727e 100644
--- a/resources/font-awesome/light/bolt-solid.svg
+++ b/src/resources/font-awesome/light/bolt-solid.svg
diff --git a/resources/font-awesome/light/check-solid.svg b/src/resources/font-awesome/light/check-solid.svg
index 9df12b6f8..9df12b6f8 100644
--- a/resources/font-awesome/light/check-solid.svg
+++ b/src/resources/font-awesome/light/check-solid.svg
diff --git a/resources/font-awesome/light/clipboard-solid.svg b/src/resources/font-awesome/light/clipboard-solid.svg
index 8fd4de99c..8fd4de99c 100644
--- a/resources/font-awesome/light/clipboard-solid.svg
+++ b/src/resources/font-awesome/light/clipboard-solid.svg
diff --git a/resources/font-awesome/light/cog-solid.svg b/src/resources/font-awesome/light/cog-solid.svg
index 1daa61e1e..1daa61e1e 100644
--- a/resources/font-awesome/light/cog-solid.svg
+++ b/src/resources/font-awesome/light/cog-solid.svg
diff --git a/resources/font-awesome/light/ellipsis-h-solid.svg b/src/resources/font-awesome/light/ellipsis-h-solid.svg
index 6583cbcbc..6583cbcbc 100644
--- a/resources/font-awesome/light/ellipsis-h-solid.svg
+++ b/src/resources/font-awesome/light/ellipsis-h-solid.svg
diff --git a/resources/font-awesome/light/exclamation-triangle-solid.svg b/src/resources/font-awesome/light/exclamation-triangle-solid.svg
index 630af9961..630af9961 100644
--- a/resources/font-awesome/light/exclamation-triangle-solid.svg
+++ b/src/resources/font-awesome/light/exclamation-triangle-solid.svg
diff --git a/resources/font-awesome/light/folder-solid.svg b/src/resources/font-awesome/light/folder-solid.svg
index 1b7d67139..1b7d67139 100644
--- a/resources/font-awesome/light/folder-solid.svg
+++ b/src/resources/font-awesome/light/folder-solid.svg
diff --git a/resources/font-awesome/light/lock-open-solid.svg b/src/resources/font-awesome/light/lock-open-solid.svg
index 83395d263..83395d263 100644
--- a/resources/font-awesome/light/lock-open-solid.svg
+++ b/src/resources/font-awesome/light/lock-open-solid.svg
diff --git a/resources/font-awesome/light/lock-solid.svg b/src/resources/font-awesome/light/lock-solid.svg
index 4c1822def..4c1822def 100644
--- a/resources/font-awesome/light/lock-solid.svg
+++ b/src/resources/font-awesome/light/lock-solid.svg
diff --git a/resources/font-awesome/light/plus-solid.svg b/src/resources/font-awesome/light/plus-solid.svg
index 2499ffba2..2499ffba2 100644
--- a/resources/font-awesome/light/plus-solid.svg
+++ b/src/resources/font-awesome/light/plus-solid.svg
diff --git a/resources/font-awesome/light/power-off-solid.svg b/src/resources/font-awesome/light/power-off-solid.svg
index ec12e78db..ec12e78db 100644
--- a/resources/font-awesome/light/power-off-solid.svg
+++ b/src/resources/font-awesome/light/power-off-solid.svg
diff --git a/resources/font-awesome/light/step-forward-solid.svg b/src/resources/font-awesome/light/step-forward-solid.svg
index a7335c355..a7335c355 100644
--- a/resources/font-awesome/light/step-forward-solid.svg
+++ b/src/resources/font-awesome/light/step-forward-solid.svg
diff --git a/resources/font-awesome/light/trash-solid.svg b/src/resources/font-awesome/light/trash-solid.svg
index 9c5250448..9c5250448 100644
--- a/resources/font-awesome/light/trash-solid.svg
+++ b/src/resources/font-awesome/light/trash-solid.svg
diff --git a/resources/font-awesome/light/user-solid.svg b/src/resources/font-awesome/light/user-solid.svg
index 6ae817ff2..6ae817ff2 100644
--- a/resources/font-awesome/light/user-solid.svg
+++ b/src/resources/font-awesome/light/user-solid.svg
diff --git a/resources/font-awesome/update_color.ps1 b/src/resources/font-awesome/update_color.ps1
index b1fe755e0..b1fe755e0 100644
--- a/resources/font-awesome/update_color.ps1
+++ b/src/resources/font-awesome/update_color.ps1
diff --git a/src/resources/loadresources.cpp b/src/resources/loadresources.cpp
new file mode 100644
index 000000000..1e5a3d12d
--- /dev/null
+++ b/src/resources/loadresources.cpp
@@ -0,0 +1,38 @@
+#include "loadresources.h"
+
+#include <qglobal.h>
+
+using namespace OCC;
+
+void static load_rc()
+{
+    Q_INIT_RESOURCE(ownCloudResources_translations);
+    Q_INIT_RESOURCE(client);
+    Q_INIT_RESOURCE(core_theme);
+#ifdef BRANDING_AVAILABLE
+    Q_INIT_RESOURCE(theme);
+#endif
+}
+
+void static unload_rc()
+{
+    Q_CLEANUP_RESOURCE(ownCloudResources_translations);
+    Q_CLEANUP_RESOURCE(client);
+    Q_CLEANUP_RESOURCE(core_theme);
+#ifdef BRANDING_AVAILABLE
+    Q_CLEANUP_RESOURCE(theme);
+#endif
+}
+
+ResourcesLoader::ResourcesLoader()
+{
+    // Q_INIT_RESOURCE must not be called in a namespace
+    ::load_rc();
+}
+
+
+ResourcesLoader::~ResourcesLoader()
+{
+    // Q_CLEANUP_RESOURCE must not be called in a namespace
+    ::unload_rc();
+}
\ No newline at end of file
diff --git a/src/resources/loadresources.h b/src/resources/loadresources.h
new file mode 100644
index 000000000..30f0c64af
--- /dev/null
+++ b/src/resources/loadresources.h
@@ -0,0 +1,12 @@
+#pragma once
+
+#include "owncloudresources.h"
+
+namespace OCC {
+class OWNCLOUDRESOURCES_EXPORT ResourcesLoader
+{
+public:
+    ResourcesLoader();
+    ~ResourcesLoader();
+};
+}
\ No newline at end of file
diff --git a/theme/black/ui-light-plain-monochrom-state-checkmark.svg b/src/resources/theme/black/ui-light-plain-monochrom-state-checkmark.svg
index d9e5d1e36..d9e5d1e36 100644
--- a/theme/black/ui-light-plain-monochrom-state-checkmark.svg
+++ b/src/resources/theme/black/ui-light-plain-monochrom-state-checkmark.svg
diff --git a/theme/black/ui-light-plain-monochrom-state-downloaded.svg b/src/resources/theme/black/ui-light-plain-monochrom-state-downloaded.svg
index c5df77b8d..c5df77b8d 100644
--- a/theme/black/ui-light-plain-monochrom-state-downloaded.svg
+++ b/src/resources/theme/black/ui-light-plain-monochrom-state-downloaded.svg
diff --git a/theme/black/ui-light-plain-monochrom-state-error.svg b/src/resources/theme/black/ui-light-plain-monochrom-state-error.svg
index 1c830f82b..1c830f82b 100644
--- a/theme/black/ui-light-plain-monochrom-state-error.svg
+++ b/src/resources/theme/black/ui-light-plain-monochrom-state-error.svg
diff --git a/theme/black/ui-light-plain-monochrom-state-info.svg b/src/resources/theme/black/ui-light-plain-monochrom-state-info.svg
index a98ae32e0..a98ae32e0 100644
--- a/theme/black/ui-light-plain-monochrom-state-info.svg
+++ b/src/resources/theme/black/ui-light-plain-monochrom-state-info.svg
diff --git a/theme/black/ui-light-plain-monochrom-state-offline.svg b/src/resources/theme/black/ui-light-plain-monochrom-state-offline.svg
index 09ba29299..09ba29299 100644
--- a/theme/black/ui-light-plain-monochrom-state-offline.svg
+++ b/src/resources/theme/black/ui-light-plain-monochrom-state-offline.svg
diff --git a/theme/black/ui-light-plain-monochrom-state-pause.svg b/src/resources/theme/black/ui-light-plain-monochrom-state-pause.svg
index 3cf2d62fb..3cf2d62fb 100644
--- a/theme/black/ui-light-plain-monochrom-state-pause.svg
+++ b/src/resources/theme/black/ui-light-plain-monochrom-state-pause.svg
diff --git a/theme/black/ui-light-plain-monochrom-state-sync.svg b/src/resources/theme/black/ui-light-plain-monochrom-state-sync.svg
index 927cc0a1f..927cc0a1f 100644
--- a/theme/black/ui-light-plain-monochrom-state-sync.svg
+++ b/src/resources/theme/black/ui-light-plain-monochrom-state-sync.svg
diff --git a/theme/black/ui-light-plain-monochrom-state-warning.svg b/src/resources/theme/black/ui-light-plain-monochrom-state-warning.svg
index a37cbcd50..a37cbcd50 100644
--- a/theme/black/ui-light-plain-monochrom-state-warning.svg
+++ b/src/resources/theme/black/ui-light-plain-monochrom-state-warning.svg
diff --git a/theme/colored/1024-owncloud-icon-sidebar.png b/src/resources/theme/colored/1024-owncloud-icon-sidebar.png
index 7afed514e..7afed514e 100644
--- a/theme/colored/1024-owncloud-icon-sidebar.png
+++ b/src/resources/theme/colored/1024-owncloud-icon-sidebar.png
diff --git a/theme/colored/1024-owncloud-icon.png b/src/resources/theme/colored/1024-owncloud-icon.png
index ba5eef2a1..ba5eef2a1 100644
--- a/theme/colored/1024-owncloud-icon.png
+++ b/src/resources/theme/colored/1024-owncloud-icon.png
diff --git a/theme/colored/128-owncloud-icon-sidebar.png b/src/resources/theme/colored/128-owncloud-icon-sidebar.png
index 688c8ad52..688c8ad52 100644
--- a/theme/colored/128-owncloud-icon-sidebar.png
+++ b/src/resources/theme/colored/128-owncloud-icon-sidebar.png
diff --git a/theme/colored/128-owncloud-icon.png b/src/resources/theme/colored/128-owncloud-icon.png
index aed06cb90..aed06cb90 100644
--- a/theme/colored/128-owncloud-icon.png
+++ b/src/resources/theme/colored/128-owncloud-icon.png
diff --git a/theme/colored/16-owncloud-icon-sidebar.png b/src/resources/theme/colored/16-owncloud-icon-sidebar.png
index 39f4118ed..39f4118ed 100644
--- a/theme/colored/16-owncloud-icon-sidebar.png
+++ b/src/resources/theme/colored/16-owncloud-icon-sidebar.png
diff --git a/theme/colored/16-owncloud-icon.png b/src/resources/theme/colored/16-owncloud-icon.png
index 7359ec6e8..7359ec6e8 100644
--- a/theme/colored/16-owncloud-icon.png
+++ b/src/resources/theme/colored/16-owncloud-icon.png
diff --git a/theme/colored/24-owncloud-icon.png b/src/resources/theme/colored/24-owncloud-icon.png
index a337636ab..a337636ab 100644
--- a/theme/colored/24-owncloud-icon.png
+++ b/src/resources/theme/colored/24-owncloud-icon.png
diff --git a/theme/colored/256-owncloud-icon-sidebar.png b/src/resources/theme/colored/256-owncloud-icon-sidebar.png
index b99f4b9b2..b99f4b9b2 100644
--- a/theme/colored/256-owncloud-icon-sidebar.png
+++ b/src/resources/theme/colored/256-owncloud-icon-sidebar.png
diff --git a/theme/colored/256-owncloud-icon.png b/src/resources/theme/colored/256-owncloud-icon.png
index 479d0e25f..479d0e25f 100644
--- a/theme/colored/256-owncloud-icon.png
+++ b/src/resources/theme/colored/256-owncloud-icon.png
diff --git a/theme/colored/32-owncloud-icon-sidebar.png b/src/resources/theme/colored/32-owncloud-icon-sidebar.png
index 8b37e95ff..8b37e95ff 100644
--- a/theme/colored/32-owncloud-icon-sidebar.png
+++ b/src/resources/theme/colored/32-owncloud-icon-sidebar.png
diff --git a/theme/colored/32-owncloud-icon.png b/src/resources/theme/colored/32-owncloud-icon.png
index d464d9930..d464d9930 100644
--- a/theme/colored/32-owncloud-icon.png
+++ b/src/resources/theme/colored/32-owncloud-icon.png
diff --git a/theme/colored/48-owncloud-icon.png b/src/resources/theme/colored/48-owncloud-icon.png
index e909ae905..e909ae905 100644
--- a/theme/colored/48-owncloud-icon.png
+++ b/src/resources/theme/colored/48-owncloud-icon.png
diff --git a/theme/colored/512-owncloud-icon-sidebar.png b/src/resources/theme/colored/512-owncloud-icon-sidebar.png
index 8132c5095..8132c5095 100644
--- a/theme/colored/512-owncloud-icon-sidebar.png
+++ b/src/resources/theme/colored/512-owncloud-icon-sidebar.png
diff --git a/theme/colored/64-owncloud-icon-sidebar.png b/src/resources/theme/colored/64-owncloud-icon-sidebar.png
index bdf9137ae..bdf9137ae 100644
--- a/theme/colored/64-owncloud-icon-sidebar.png
+++ b/src/resources/theme/colored/64-owncloud-icon-sidebar.png
diff --git a/theme/colored/64-owncloud-icon.png b/src/resources/theme/colored/64-owncloud-icon.png
index 1cd2af7c1..1cd2af7c1 100644
--- a/theme/colored/64-owncloud-icon.png
+++ b/src/resources/theme/colored/64-owncloud-icon.png
diff --git a/theme/colored/sidebar.svg b/src/resources/theme/colored/sidebar.svg
index 89fab7c05..89fab7c05 100644
--- a/theme/colored/sidebar.svg
+++ b/src/resources/theme/colored/sidebar.svg
diff --git a/theme/colored/ui-light-plain-color-state-checkmark.svg b/src/resources/theme/colored/ui-light-plain-color-state-checkmark.svg
index bbea91eb8..bbea91eb8 100644
--- a/theme/colored/ui-light-plain-color-state-checkmark.svg
+++ b/src/resources/theme/colored/ui-light-plain-color-state-checkmark.svg
diff --git a/theme/colored/ui-light-plain-color-state-downloaded.svg b/src/resources/theme/colored/ui-light-plain-color-state-downloaded.svg
index b38aef983..b38aef983 100644
--- a/theme/colored/ui-light-plain-color-state-downloaded.svg
+++ b/src/resources/theme/colored/ui-light-plain-color-state-downloaded.svg
diff --git a/theme/colored/ui-light-plain-color-state-error.svg b/src/resources/theme/colored/ui-light-plain-color-state-error.svg
index d8b3410af..d8b3410af 100644
--- a/theme/colored/ui-light-plain-color-state-error.svg
+++ b/src/resources/theme/colored/ui-light-plain-color-state-error.svg
diff --git a/theme/colored/ui-light-plain-color-state-info.svg b/src/resources/theme/colored/ui-light-plain-color-state-info.svg
index a51c4145f..a51c4145f 100644
--- a/theme/colored/ui-light-plain-color-state-info.svg
+++ b/src/resources/theme/colored/ui-light-plain-color-state-info.svg
diff --git a/theme/colored/ui-light-plain-color-state-offline.svg b/src/resources/theme/colored/ui-light-plain-color-state-offline.svg
index 8f7c934eb..8f7c934eb 100644
--- a/theme/colored/ui-light-plain-color-state-offline.svg
+++ b/src/resources/theme/colored/ui-light-plain-color-state-offline.svg
diff --git a/theme/colored/ui-light-plain-color-state-pause.svg b/src/resources/theme/colored/ui-light-plain-color-state-pause.svg
index c4694d386..c4694d386 100644
--- a/theme/colored/ui-light-plain-color-state-pause.svg
+++ b/src/resources/theme/colored/ui-light-plain-color-state-pause.svg
diff --git a/theme/colored/ui-light-plain-color-state-sync.svg b/src/resources/theme/colored/ui-light-plain-color-state-sync.svg
index 7225bf985..7225bf985 100644
--- a/theme/colored/ui-light-plain-color-state-sync.svg
+++ b/src/resources/theme/colored/ui-light-plain-color-state-sync.svg
diff --git a/theme/colored/ui-light-plain-color-state-warning.svg b/src/resources/theme/colored/ui-light-plain-color-state-warning.svg
index d8c10126f..d8c10126f 100644
--- a/theme/colored/ui-light-plain-color-state-warning.svg
+++ b/src/resources/theme/colored/ui-light-plain-color-state-warning.svg
diff --git a/theme/dark/ui-dark-plain-color-state-checkmark.svg b/src/resources/theme/dark/ui-dark-plain-color-state-checkmark.svg
index 3fd73d000..3fd73d000 100644
--- a/theme/dark/ui-dark-plain-color-state-checkmark.svg
+++ b/src/resources/theme/dark/ui-dark-plain-color-state-checkmark.svg
diff --git a/theme/dark/ui-dark-plain-color-state-downloaded.svg b/src/resources/theme/dark/ui-dark-plain-color-state-downloaded.svg
index 4497b2d9f..4497b2d9f 100644
--- a/theme/dark/ui-dark-plain-color-state-downloaded.svg
+++ b/src/resources/theme/dark/ui-dark-plain-color-state-downloaded.svg
diff --git a/theme/dark/ui-dark-plain-color-state-error.svg b/src/resources/theme/dark/ui-dark-plain-color-state-error.svg
index b53774bf3..b53774bf3 100644
--- a/theme/dark/ui-dark-plain-color-state-error.svg
+++ b/src/resources/theme/dark/ui-dark-plain-color-state-error.svg
diff --git a/theme/dark/ui-dark-plain-color-state-info.svg b/src/resources/theme/dark/ui-dark-plain-color-state-info.svg
index f1c2cc0c3..f1c2cc0c3 100644
--- a/theme/dark/ui-dark-plain-color-state-info.svg
+++ b/src/resources/theme/dark/ui-dark-plain-color-state-info.svg
diff --git a/theme/dark/ui-dark-plain-color-state-offline.svg b/src/resources/theme/dark/ui-dark-plain-color-state-offline.svg
index dce80a64b..dce80a64b 100644
--- a/theme/dark/ui-dark-plain-color-state-offline.svg
+++ b/src/resources/theme/dark/ui-dark-plain-color-state-offline.svg
diff --git a/theme/dark/ui-dark-plain-color-state-pause.svg b/src/resources/theme/dark/ui-dark-plain-color-state-pause.svg
index e53cb185c..e53cb185c 100644
--- a/theme/dark/ui-dark-plain-color-state-pause.svg
+++ b/src/resources/theme/dark/ui-dark-plain-color-state-pause.svg
diff --git a/theme/dark/ui-dark-plain-color-state-sync.svg b/src/resources/theme/dark/ui-dark-plain-color-state-sync.svg
index d824ede36..d824ede36 100644
--- a/theme/dark/ui-dark-plain-color-state-sync.svg
+++ b/src/resources/theme/dark/ui-dark-plain-color-state-sync.svg
diff --git a/theme/dark/ui-dark-plain-color-state-warning.svg b/src/resources/theme/dark/ui-dark-plain-color-state-warning.svg
index 76b018894..76b018894 100644
--- a/theme/dark/ui-dark-plain-color-state-warning.svg
+++ b/src/resources/theme/dark/ui-dark-plain-color-state-warning.svg
diff --git a/theme/universal/oc-image-about.svg b/src/resources/theme/universal/oc-image-about.svg
index 551f6ed41..551f6ed41 100644
--- a/theme/universal/oc-image-about.svg
+++ b/src/resources/theme/universal/oc-image-about.svg
diff --git a/theme/universal/owncloud-icon.svg b/src/resources/theme/universal/owncloud-icon.svg
index 0026f7db1..0026f7db1 100644
--- a/theme/universal/owncloud-icon.svg
+++ b/src/resources/theme/universal/owncloud-icon.svg
diff --git a/theme/universal/wizard_logo.svg b/src/resources/theme/universal/wizard_logo.svg
index 44508f6f9..44508f6f9 100644
--- a/theme/universal/wizard_logo.svg
+++ b/src/resources/theme/universal/wizard_logo.svg
diff --git a/theme/white/ui-dark-plain-monochrom-state-checkmark.svg b/src/resources/theme/white/ui-dark-plain-monochrom-state-checkmark.svg
index a0f66d4f2..a0f66d4f2 100644
--- a/theme/white/ui-dark-plain-monochrom-state-checkmark.svg
+++ b/src/resources/theme/white/ui-dark-plain-monochrom-state-checkmark.svg
diff --git a/theme/white/ui-dark-plain-monochrom-state-downloaded.svg b/src/resources/theme/white/ui-dark-plain-monochrom-state-downloaded.svg
index 9eb004677..9eb004677 100644
--- a/theme/white/ui-dark-plain-monochrom-state-downloaded.svg
+++ b/src/resources/theme/white/ui-dark-plain-monochrom-state-downloaded.svg
diff --git a/theme/white/ui-dark-plain-monochrom-state-error.svg b/src/resources/theme/white/ui-dark-plain-monochrom-state-error.svg
index 7dfd6f2ae..7dfd6f2ae 100644
--- a/theme/white/ui-dark-plain-monochrom-state-error.svg
+++ b/src/resources/theme/white/ui-dark-plain-monochrom-state-error.svg
diff --git a/theme/white/ui-dark-plain-monochrom-state-info.svg b/src/resources/theme/white/ui-dark-plain-monochrom-state-info.svg
index bd618326b..bd618326b 100644
--- a/theme/white/ui-dark-plain-monochrom-state-info.svg
+++ b/src/resources/theme/white/ui-dark-plain-monochrom-state-info.svg
diff --git a/theme/white/ui-dark-plain-monochrom-state-offline.svg b/src/resources/theme/white/ui-dark-plain-monochrom-state-offline.svg
index 17672d236..17672d236 100644
--- a/theme/white/ui-dark-plain-monochrom-state-offline.svg
+++ b/src/resources/theme/white/ui-dark-plain-monochrom-state-offline.svg
diff --git a/theme/white/ui-dark-plain-monochrom-state-pause.svg b/src/resources/theme/white/ui-dark-plain-monochrom-state-pause.svg
index 2d87cdcd8..2d87cdcd8 100644
--- a/theme/white/ui-dark-plain-monochrom-state-pause.svg
+++ b/src/resources/theme/white/ui-dark-plain-monochrom-state-pause.svg
diff --git a/theme/white/ui-dark-plain-monochrom-state-sync.svg b/src/resources/theme/white/ui-dark-plain-monochrom-state-sync.svg
index 02967ecf2..02967ecf2 100644
--- a/theme/white/ui-dark-plain-monochrom-state-sync.svg
+++ b/src/resources/theme/white/ui-dark-plain-monochrom-state-sync.svg
diff --git a/theme/white/ui-dark-plain-monochrom-state-warning.svg b/src/resources/theme/white/ui-dark-plain-monochrom-state-warning.svg
index 1a768eae2..1a768eae2 100644
--- a/theme/white/ui-dark-plain-monochrom-state-warning.svg
+++ b/src/resources/theme/white/ui-dark-plain-monochrom-state-warning.svg
diff --git a/resources/wizard/style.qss b/src/resources/wizard/style.qss
index ad705c517..ad705c517 100644
--- a/resources/wizard/style.qss
+++ b/src/resources/wizard/style.qss
diff --git a/test/testutils/CMakeLists.txt b/test/testutils/CMakeLists.txt
index 1f07f8d9a..45603cbea 100644
--- a/test/testutils/CMakeLists.txt
+++ b/test/testutils/CMakeLists.txt
@@ -4,4 +4,4 @@ target_link_libraries(syncenginetestutils PUBLIC owncloudCore Qt5::Test)
 # testutilsloader.cpp uses Q_COREAPP_STARTUP_FUNCTION which can't used reliably in a static lib
 # therefore we compile it in the tests
 add_library(testutilsloader OBJECT testutilsloader.cpp)
-target_link_libraries(testutilsloader PUBLIC owncloudCore)
+target_link_libraries(testutilsloader PUBLIC owncloudCore ownCloudResources)
diff --git a/test/testutils/testutilsloader.cpp b/test/testutils/testutilsloader.cpp
index 1b0666add..1ecd73dad 100644
--- a/test/testutils/testutilsloader.cpp
+++ b/test/testutils/testutilsloader.cpp
@@ -1,5 +1,6 @@
 #include "configfile.h"
 #include "logger.h"
+#include "resources/loadresources.h"
 
 #include <QCoreApplication>
 #include <QTemporaryDir>
@@ -7,6 +8,9 @@
 namespace {
 void setupLogger()
 {
+    // load the resources
+    static const OCC::ResourcesLoader resoruces;
+
     static QTemporaryDir dir;
     OCC::ConfigFile::setConfDir(dir.path()); // we don't want to pollute the user's config file