From f899bda81d151155376ed3b4b257d85500957aff Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 5 Jul 2018 12:01:44 +0200 Subject: [PATCH] [calamares] Restore missing search paths - Misplaced {} makes the branding search path empty - Reported by @apachelogger --- src/calamares/CalamaresApplication.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/calamares/CalamaresApplication.cpp b/src/calamares/CalamaresApplication.cpp index ef6c37912..018e2b677 100644 --- a/src/calamares/CalamaresApplication.cpp +++ b/src/calamares/CalamaresApplication.cpp @@ -181,12 +181,9 @@ brandingFileCandidates( bool assumeBuilddir, const QString& brandingFilename ) else { if ( assumeBuilddir ) - { brandingPaths << ( QDir::currentPath() + QStringLiteral( "/src/" ) + brandingFilename ); - brandingPaths << QDir( CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/" ) - .absoluteFilePath( brandingFilename ); - brandingPaths << CalamaresUtils::appDataDir().absoluteFilePath( brandingFilename); - } + brandingPaths << QDir( CMAKE_INSTALL_FULL_SYSCONFDIR "/calamares/" ).absoluteFilePath( brandingFilename ); + brandingPaths << CalamaresUtils::appDataDir().absoluteFilePath( brandingFilename); } return brandingPaths;