summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/packagemanagergui.cpp
diff options
context:
space:
mode:
authorKatja Marttila <katja.marttila@theqtcompany.com>2016-02-15 13:02:12 +0200
committerKatja Marttila <katja.marttila@theqtcompany.com>2016-02-29 12:18:16 +0000
commit63e61f2d73f97dd8a88dc5b91377afdcbffa338e (patch)
tree9bb5d800aba35104937e77a53c6dbfc42da1298f /src/libs/installer/packagemanagergui.cpp
parent1d781f73424095d816e7c360abf6ab2c127cb8b3 (diff)
fix banner size
If WizardDefaultSize was not set, banner size was zero. In this commit default banner size to page size if WizardDefaultSize is not set. Also resize banner only when it is found to avoid warning messages in console. Change-Id: If47f947b134714ae935d80bc3074226763ca8ea7 Reviewed-by: Karsten Heimrich <karsten.heimrich@theqtcompany.com>
Diffstat (limited to 'src/libs/installer/packagemanagergui.cpp')
-rw-r--r--src/libs/installer/packagemanagergui.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 4aef1ae83..3d58cf1af 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -1065,8 +1065,15 @@ QPixmap PackageManagerPage::bannerPixmap() const
{
QPixmap banner(m_core->value(QLatin1String("BannerPixmap")));
- return banner.scaledToWidth(m_core->settings().wizardDefaultWidth(),
- Qt::SmoothTransformation);
+ if (!banner.isNull()) {
+ int width;
+ if (m_core->settings().containsValue(QLatin1String("WizardDefaultWidth")) )
+ width = m_core->settings().wizardDefaultWidth();
+ else
+ width = size().width();
+ banner = banner.scaledToWidth(width, Qt::SmoothTransformation);
+ }
+ return banner;
}
/*!