diff --git a/src/skin/legacy/legacyskinparser.cpp b/src/skin/legacy/legacyskinparser.cpp index 012c2e5b291..3f2466d8abf 100644 --- a/src/skin/legacy/legacyskinparser.cpp +++ b/src/skin/legacy/legacyskinparser.cpp @@ -405,8 +405,8 @@ QWidget* LegacySkinParser::parseSkin(const QString& skinPath, QWidget* pParent) // that use the same template inheritance scheme like official skins, but we // don't because unfortunately there is no reliable way to apply equivalent // path replacement in stylesheetAbsIconPaths(). - QString systemSkinsPath(m_pConfig->getResourcePath() + "/skins/"); - QDir::addSearchPath("skins", systemSkinsPath); + QString systemSkinsPath(m_pConfig->getResourcePath() + "skins/"); + QDir::setSearchPaths("skins", QStringList{systemSkinsPath}); ColorSchemeParser::setupLegacyColorSchemes(skinDocument, m_pConfig, &m_style, m_pContext.get()); diff --git a/src/skin/skinloader.cpp b/src/skin/skinloader.cpp index ff344c9127d..280f4b922a9 100644 --- a/src/skin/skinloader.cpp +++ b/src/skin/skinloader.cpp @@ -108,20 +108,19 @@ SkinPointer SkinLoader::getConfiguredSkin() const { DEBUG_ASSERT(!configSkin.isEmpty()); SkinPointer pSkin = getSkin(configSkin); if (pSkin && pSkin->isValid()) { - qInfo() << "Loaded skin" << configSkin; return pSkin; } - qWarning() << "Failed to load skin" << configSkin; + qWarning() << "Failed to find configured skin" << configSkin; // Fallback to default skin as last resort const QString defaultSkinName = getDefaultSkinName(); DEBUG_ASSERT(!defaultSkinName.isEmpty()); pSkin = getSkin(defaultSkinName); VERIFY_OR_DEBUG_ASSERT(pSkin && pSkin->isValid()) { - qWarning() << "Failed to load default skin" << defaultSkinName; + qWarning() << "Can't find default skin" << defaultSkinName; return nullptr; } - qInfo() << "Loaded default skin" << defaultSkinName; + qInfo() << "Found default skin" << defaultSkinName; return pSkin; } @@ -181,6 +180,7 @@ QWidget* SkinLoader::loadConfiguredSkin(QWidget* pParent, VERIFY_OR_DEBUG_ASSERT(pLoadedSkin != nullptr) { qCritical() << "No skin can be loaded, please check your installation."; } + qInfo() << "Loaded skin" << pSkin->name() << "from" << pSkin->path().filePath(); return pLoadedSkin; }