diff --git a/CMakeLists.txt b/CMakeLists.txt index 8c291b9c4594..61c79759cd43 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -312,4 +312,4 @@ elseif(BUILD_CLIENT) configure_file(sync-exclude.lst bin/sync-exclude.lst COPYONLY) endif() -feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES) +feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES INCLUDE_QUIET_PACKAGES) \ No newline at end of file diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 43e6550abf67..2da46bad1e5e 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -793,4 +793,4 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT WIN32) endif(SharedMimeInfo_FOUND) endif() -configure_file(configgui.h.in ${CMAKE_CURRENT_BINARY_DIR}/configgui.h) +configure_file(configgui.h.in ${CMAKE_CURRENT_BINARY_DIR}/configgui.h) \ No newline at end of file diff --git a/src/gui/main.cpp b/src/gui/main.cpp index a5ee49bcadf4..bc062b1a878a 100644 --- a/src/gui/main.cpp +++ b/src/gui/main.cpp @@ -58,14 +58,12 @@ int main(int argc, char **argv) #ifdef Q_OS_WIN SetDllDirectory(L""); #endif + bool resourceLoaded = false; const QString currentPath = QDir::currentPath(); - if(Utility::isMac()) - { + if(Utility::isMac()) { resourceLoaded = QResource::registerResource(QDir::toNativeSeparators("/Applications/MagentaCLOUD.app/Contents/Resources/nmctheme_v1.rcc")); - } - else if(Utility::isWindows() || !resourceLoaded) - { + } else if(Utility::isWindows() || !resourceLoaded) { resourceLoaded = QResource::registerResource(QDir::toNativeSeparators(currentPath + "/nmctheme_v1.rcc")); } @@ -199,4 +197,4 @@ int main(int argc, char **argv) } return app.exec(); -} +} \ No newline at end of file