From 7d78fb72362bc14dfb8f6ee72ab8c8e45efdb716 Mon Sep 17 00:00:00 2001 From: Martchus Date: Mon, 5 Oct 2020 18:37:42 +0200 Subject: [PATCH] Apply clang-format --- resources/resources.cpp | 9 +++++---- resources/resources.h | 2 +- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/resources.cpp b/resources/resources.cpp index 23c99d6..bbff27b 100644 --- a/resources/resources.cpp +++ b/resources/resources.cpp @@ -121,13 +121,14 @@ void loadQtTranslationFile(initializer_list repositoryNames, const QStr QString path; if ((!additionalTranslationFilePath().isEmpty() && qtTranslator->load(fileName, path = additionalTranslationFilePath())) - || qtTranslator->load(fileName, path = + || qtTranslator->load(fileName, + path = #if (QT_VERSION < QT_VERSION_CHECK(6, 0, 0)) - QLibraryInfo::location(QLibraryInfo::TranslationsPath) + QLibraryInfo::location(QLibraryInfo::TranslationsPath) #else - QLibraryInfo::path(QLibraryInfo::TranslationsPath) + QLibraryInfo::path(QLibraryInfo::TranslationsPath) #endif - ) + ) || qtTranslator->load(fileName, path = QStringLiteral("../share/qt/translations")) || qtTranslator->load(fileName, path = QStringLiteral(":/translations"))) { QCoreApplication::installTranslator(qtTranslator); diff --git a/resources/resources.h b/resources/resources.h index e2d0bfb..c3b286c 100644 --- a/resources/resources.h +++ b/resources/resources.h @@ -3,8 +3,8 @@ #include "../global.h" -#include #include +#include #include