diff --git a/src/app/images/logo/128/QtProject-qtcreator.png b/src/app/images/logo/128/QtProject-qtcreator.png index 53a42c20fe6..acee6493523 100644 Binary files a/src/app/images/logo/128/QtProject-qtcreator.png and b/src/app/images/logo/128/QtProject-qtcreator.png differ diff --git a/src/app/images/logo/16/QtProject-qtcreator.png b/src/app/images/logo/16/QtProject-qtcreator.png index d48df57e634..cccb42d5f7d 100644 Binary files a/src/app/images/logo/16/QtProject-qtcreator.png and b/src/app/images/logo/16/QtProject-qtcreator.png differ diff --git a/src/app/images/logo/24/QtProject-qtcreator.png b/src/app/images/logo/24/QtProject-qtcreator.png index 449c740a111..6ee1be9ac1f 100644 Binary files a/src/app/images/logo/24/QtProject-qtcreator.png and b/src/app/images/logo/24/QtProject-qtcreator.png differ diff --git a/src/app/images/logo/256/QtProject-qtcreator.png b/src/app/images/logo/256/QtProject-qtcreator.png index 3a9cf292bcf..efa1d4b0112 100644 Binary files a/src/app/images/logo/256/QtProject-qtcreator.png and b/src/app/images/logo/256/QtProject-qtcreator.png differ diff --git a/src/app/images/logo/32/QtProject-qtcreator.png b/src/app/images/logo/32/QtProject-qtcreator.png index 87ab1ba5cb6..389e7a13eda 100644 Binary files a/src/app/images/logo/32/QtProject-qtcreator.png and b/src/app/images/logo/32/QtProject-qtcreator.png differ diff --git a/src/app/images/logo/48/QtProject-qtcreator.png b/src/app/images/logo/48/QtProject-qtcreator.png index 43a6834a140..a8b0260e920 100644 Binary files a/src/app/images/logo/48/QtProject-qtcreator.png and b/src/app/images/logo/48/QtProject-qtcreator.png differ diff --git a/src/app/images/logo/512/QtProject-qtcreator.png b/src/app/images/logo/512/QtProject-qtcreator.png index acbb5a5134a..23deb334103 100644 Binary files a/src/app/images/logo/512/QtProject-qtcreator.png and b/src/app/images/logo/512/QtProject-qtcreator.png differ diff --git a/src/app/images/logo/64/QtProject-qtcreator.png b/src/app/images/logo/64/QtProject-qtcreator.png index 1a89d932f5e..2195a6170fd 100644 Binary files a/src/app/images/logo/64/QtProject-qtcreator.png and b/src/app/images/logo/64/QtProject-qtcreator.png differ diff --git a/src/app/qtcreator.ico b/src/app/qtcreator.ico index 4bf9505ee30..1a4a16d9d86 100644 Binary files a/src/app/qtcreator.ico and b/src/app/qtcreator.ico differ diff --git a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128.png index 41efea2cdb2..2e9cbdc7add 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128.png and b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128@2x.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128@2x.png index fc05e560f33..afb49bdee19 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128@2x.png and b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_128x128@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16.png index f9ef1518215..2e8cf501f1e 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16.png and b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16@2x.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16@2x.png index d2d1be1b165..7dd6497de90 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16@2x.png and b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_16x16@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256.png index fc05e560f33..afb49bdee19 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256.png and b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256@2x.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256@2x.png index 26f9765d1f2..11422ec0452 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256@2x.png and b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_256x256@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32.png index d2d1be1b165..7dd6497de90 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32.png and b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32@2x.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32@2x.png index fd3ed0aa9d1..19a51e047f9 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32@2x.png and b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_32x32@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512.png index 26f9765d1f2..11422ec0452 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512.png and b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512@2x.png b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512@2x.png index c11fe74891e..04109073074 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512@2x.png and b/src/app/qtcreator.xcassets/qtcreator-project.iconset/icon_512x512@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128.png index 53a42c20fe6..6a5bd0b9cb2 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128.png and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128@2x.png index 3a9cf292bcf..71642ef953e 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128@2x.png and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_128x128@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16.png index d48df57e634..16772909bc8 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16.png and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16@2x.png index 87ab1ba5cb6..c03cfc235c4 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16@2x.png and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_16x16@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256.png index 3a9cf292bcf..71642ef953e 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256.png and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256@2x.png index acbb5a5134a..cb6599145d3 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256@2x.png and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_256x256@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32.png index 87ab1ba5cb6..c03cfc235c4 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32.png and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32@2x.png index 1a89d932f5e..0876aa7827a 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32@2x.png and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_32x32@2x.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512.png index acbb5a5134a..cb6599145d3 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512.png and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512.png differ diff --git a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512@2x.png b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512@2x.png index 579ec88ad7d..760b7f8a08d 100644 Binary files a/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512@2x.png and b/src/app/qtcreator.xcassets/qtcreator.appiconset/icon_512x512@2x.png differ diff --git a/src/plugins/coreplugin/versiondialog.cpp b/src/plugins/coreplugin/versiondialog.cpp index 48a844fa8c5..6a3b23b6ff9 100644 --- a/src/plugins/coreplugin/versiondialog.cpp +++ b/src/plugins/coreplugin/versiondialog.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include @@ -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); diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp index 1b2ef235f57..f8f80d1e0a4 100644 --- a/src/plugins/welcome/welcomeplugin.cpp +++ b/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), diff --git a/tests/manual/qml/testfiles_quick2/images/qtcreator.ico b/tests/manual/qml/testfiles_quick2/images/qtcreator.ico index 4bf9505ee30..c3ef8ac9c3f 100644 Binary files a/tests/manual/qml/testfiles_quick2/images/qtcreator.ico and b/tests/manual/qml/testfiles_quick2/images/qtcreator.ico differ diff --git a/tests/manual/qml/testfiles_quick2/images/qtcreator.jpg b/tests/manual/qml/testfiles_quick2/images/qtcreator.jpg index 46acfd37fdc..c61e4c042a7 100644 Binary files a/tests/manual/qml/testfiles_quick2/images/qtcreator.jpg and b/tests/manual/qml/testfiles_quick2/images/qtcreator.jpg differ diff --git a/tests/manual/qml/testfiles_quick2/images/qtcreator.png b/tests/manual/qml/testfiles_quick2/images/qtcreator.png index 3a9cf292bcf..efa1d4b0112 100644 Binary files a/tests/manual/qml/testfiles_quick2/images/qtcreator.png and b/tests/manual/qml/testfiles_quick2/images/qtcreator.png differ