Update application icons

Fixes: QTCREATORBUG-32142
Change-Id: Ic841b4066d6f66fd975d649c86dfed15d32ab2e4
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Kai Köhne <kai.koehne@qt.io>

src/plugins/coreplugin/versiondialog.cpp

@@ -14,6 +14,7 @@
 #include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>
 #include <utils/stringutils.h>
+#include <utils/stylehelper.h>
 #include <utils/utilsicons.h>
 
 #include <QDialog>
@@ -46,6 +47,8 @@ VersionDialog::VersionDialog()
 
     auto logoLabel = new QLabel;
     logoLabel->setPixmap(Icons::QTCREATORLOGO_BIG.pixmap());
+    const int margin = Utils::StyleHelper::SpacingTokens::ExPaddingGapL;
+    logoLabel->setContentsMargins({margin, margin, margin, margin});
 
     auto copyRightLabel = new QLabel(ICore::aboutInformationHtml());
     copyRightLabel->setWordWrap(true);

src/plugins/welcome/welcomeplugin.cpp

@@ -65,15 +65,10 @@ public:
         auto ideIconLabel = new QLabel;
         {
             const QPixmap logo = Core::Icons::QTCREATORLOGO_BIG.pixmap();
-            const int size = logo.width();
-            const QRect cropR = size == 128 ? QRect(9, 22, 110, 84) : QRect(17, 45, 222, 166);
-            const QPixmap croppedLogo = logo.copy(cropR);
-            const int lineHeight = welcomeTF.lineHeight();
-            const QPixmap scaledCroppedLogo =
-                croppedLogo.scaledToHeight((lineHeight - 12) * croppedLogo.devicePixelRatioF(),
-                                           Qt::SmoothTransformation);
-            ideIconLabel->setPixmap(scaledCroppedLogo);
-            ideIconLabel->setFixedHeight(lineHeight);
+            const int iconSize = 40 * logo.devicePixelRatio();
+            const QPixmap scaledLogo = logo.scaledToHeight(iconSize, Qt::SmoothTransformation);
+            ideIconLabel->setPixmap(scaledLogo);
+            ideIconLabel->setFixedHeight(welcomeTF.lineHeight());
         }
 
         auto welcomeLabel = new ElidingLabel(Tr::tr("Welcome to %1")
@@ -88,7 +83,7 @@ public:
                 ideIconLabel,
                 welcomeLabel,
                 st,
-                spacing(ExVPaddingGapXl),
+                spacing(HGapM),
                 customMargins(HPaddingM, VPaddingM, HPaddingM, VPaddingM),
             },
             createRule(Qt::Horizontal),