From 5f3c26b6c4e36b9f2b69e9e751efd04623511cf7 Mon Sep 17 00:00:00 2001 From: Katja Marttila Date: Mon, 13 Jan 2020 13:10:44 +0200 Subject: Fix QWizardPage title color Title color can be given in config.xml with tag TitleColor. If tag is not set, set title color to empty string so correct default title color is used from palette. Task-number: QTIFW-1557 Change-Id: Ic0c808127203c1a70f8183627ac846229223076c Reviewed-by: Iikka Eklund --- src/libs/installer/packagemanagergui.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp index 837e44c56..0ccd53da2 100644 --- a/src/libs/installer/packagemanagergui.cpp +++ b/src/libs/installer/packagemanagergui.cpp @@ -1059,16 +1059,14 @@ void PackageManagerGui::currentPageChanged(int newId) */ PackageManagerPage::PackageManagerPage(PackageManagerCore *core) : m_complete(true) + , m_titleColor(QString()) , m_needsSettingsButton(false) , m_core(core) , validatorComponent(nullptr) { - if (!m_core->settings().titleColor().isEmpty()) { + if (!m_core->settings().titleColor().isEmpty()) m_titleColor = m_core->settings().titleColor(); - } else { - QColor defaultColor = style()->standardPalette().text().color(); - m_titleColor = defaultColor.name(); - } + setPixmap(QWizard::WatermarkPixmap, watermarkPixmap()); setPixmap(QWizard::BannerPixmap, bannerPixmap()); setPixmap(QWizard::LogoPixmap, logoPixmap()); -- cgit v1.2.3