aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2023-08-10 20:25:01 +0200
committerSefa Eyeoglu <contact@scrumplex.net>2023-08-11 15:57:12 +0200
commit73adac2501eb2279523531da9d04f514ab614853 (patch)
tree5f7d6eb49e893c626b3aa5c0e4fedba8ebc1a351
parent97ef8e8d0ee063315aeae5c29abcdc53563c0431 (diff)
downloadPrismLauncher-73adac2501eb2279523531da9d04f514ab614853.tar.gz
PrismLauncher-73adac2501eb2279523531da9d04f514ab614853.tar.bz2
PrismLauncher-73adac2501eb2279523531da9d04f514ab614853.zip
fix: use QColorConstants in Qt 5.14+
Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
-rw-r--r--launcher/SkinUtils.cpp4
-rw-r--r--launcher/minecraft/auth/MinecraftAccount.cpp5
2 files changed, 9 insertions, 0 deletions
diff --git a/launcher/SkinUtils.cpp b/launcher/SkinUtils.cpp
index 15be1cec..989114ad 100644
--- a/launcher/SkinUtils.cpp
+++ b/launcher/SkinUtils.cpp
@@ -35,7 +35,11 @@ QPixmap getFaceFromCache(QString username, int height, int width)
QPixmap skinTexture(fskin.fileName());
if (!skinTexture.isNull()) {
QPixmap skin = QPixmap(8, 8);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
skin.fill(QColorConstants::Transparent);
+#else
+ skin.fill(QColor(0, 0, 0, 0));
+#endif
QPainter painter(&skin);
painter.drawPixmap(0, 0, skinTexture.copy(8, 8, 8, 8));
painter.drawPixmap(0, 0, skinTexture.copy(40, 8, 8, 8));
diff --git a/launcher/minecraft/auth/MinecraftAccount.cpp b/launcher/minecraft/auth/MinecraftAccount.cpp
index 79213fe9..6c2f0805 100644
--- a/launcher/minecraft/auth/MinecraftAccount.cpp
+++ b/launcher/minecraft/auth/MinecraftAccount.cpp
@@ -37,6 +37,7 @@
#include "MinecraftAccount.h"
+#include <QColor>
#include <QCryptographicHash>
#include <QJsonArray>
#include <QJsonDocument>
@@ -126,7 +127,11 @@ QPixmap MinecraftAccount::getFace() const
return QPixmap();
}
QPixmap skin = QPixmap(8, 8);
+#if QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)
skin.fill(QColorConstants::Transparent);
+#else
+ skin.fill(QColor(0, 0, 0, 0));
+#endif
QPainter painter(&skin);
painter.drawPixmap(0, 0, skinTexture.copy(8, 8, 8, 8));
painter.drawPixmap(0, 0, skinTexture.copy(40, 8, 8, 8));