Merge remote-tracking branch 'origin/1.5'

Conflicts:
	installerfw.pri

Change-Id: I8bd85997fef0fcfa21a4dd28a6362748a54a4a3b

1 files changed, 0 insertions, 9 deletions

diff --git a/src/libs/installer/packagemanagergui.cpp b/src/libs/installer/packagemanagergui.cpp
index 9d6414adc..1757f21f5 100644
--- a/src/libs/installer/packagemanagergui.cpp
+++ b/src/libs/installer/packagemanagergui.cpp
@@ -123,9 +123,7 @@ public:
         , m_widget(widget)
     {
         setObjectName(QLatin1String("Dynamic") + widget->objectName());
-        setPixmap(QWizard::LogoPixmap, logoPixmap());
         setPixmap(QWizard::WatermarkPixmap, QPixmap());
-        setPixmap(QWizard::BannerPixmap, QPixmap());
 
         setLayout(new QVBoxLayout);
         setColoredSubTitle(QLatin1String(" "));
@@ -903,13 +901,6 @@ LicenseAgreementPage::LicenseAgreementPage(PackageManagerCore *core)
     m_rejectLabel->setObjectName(QLatin1String("RejectLicenseLabel"));
     m_rejectLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
 
-#ifdef Q_OS_UNIX
-    QFont labelFont(font());
-    labelFont.setPixelSize(9);
-    m_acceptLabel->setFont(labelFont);
-    m_rejectLabel->setFont(labelFont);
-#endif
-
     QGridLayout *gridLayout = new QGridLayout;
     gridLayout->setColumnStretch(1, 1);
     gridLayout->addWidget(m_acceptRadioButton, 0, 0);