remove conflicting changes

nextmcloud · Jul 16, 2024 · 0ceac8a · 0ceac8a
1 parent 71f5d15
commit 0ceac8a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 17 deletions.
diff --git 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/
+theme.qrc
diff --git 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);