diff --git a/.gitignore b/.gitignore index ceea196245ae..2a4b61aa7b3f 100644 --- a/.gitignore +++ b/.gitignore @@ -189,7 +189,4 @@ convert.exe *-sidebar.png *-w10startmenu.png *state-*.png -theme.qrc - -# Ignore specific folders -shell_integration/MacOSX/NextcloudIntegration/NextcloudIntegration.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/ \ No newline at end of file +theme.qrc \ No newline at end of file diff --git a/src/gui/main.cpp b/src/gui/main.cpp index 6bf132bd1225..8a0166b010e8 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -57,19 +57,7 @@ int main(int argc, char **argv) #ifdef Q_OS_WIN SetDllDirectory(L""); -#endif - - bool resourceLoaded = false; - const QString currentPath = QDir::currentPath(); - if(Utility::isMac()) - { - resourceLoaded = QResource::registerResource(QDir::toNativeSeparators("/Applications/MagentaCLOUD.app/Contents/Resources/nmctheme_v1.rcc")); - } - else if(Utility::isWindows() || !resourceLoaded) - { - resourceLoaded = QResource::registerResource(QDir::toNativeSeparators(currentPath + "/nmctheme_v1.rcc")); - } - +#endif Q_INIT_RESOURCE(resources); Q_INIT_RESOURCE(theme);