diff options
author | Katja Marttila <katja.marttila@qt.io> | 2020-01-13 13:10:44 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2020-01-14 10:13:14 +0000 |
commit | 5f3c26b6c4e36b9f2b69e9e751efd04623511cf7 (patch) | |
tree | 78b96865e8eb04a923f3031d123752d394ac5b29 | |
parent | 4d289c333fd8cc9ca795c24c37adb2e8e40c1653 (diff) |
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 <iikka.eklund@qt.io>
-rw-r--r-- | src/libs/installer/packagemanagergui.cpp | 8 |
1 files 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()); |