diff options
Diffstat (limited to 'src/widgets')
-rw-r--r-- | src/widgets/kernel/qicon.cpp | 2 | ||||
-rw-r--r-- | src/widgets/kernel/qiconloader.cpp | 2 | ||||
-rw-r--r-- | src/widgets/styles/qgtkstyle.cpp | 2 | ||||
-rw-r--r-- | src/widgets/styles/qplastiquestyle.cpp | 8 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/widgets/kernel/qicon.cpp b/src/widgets/kernel/qicon.cpp index 369e26c21e..62c99a64c8 100644 --- a/src/widgets/kernel/qicon.cpp +++ b/src/widgets/kernel/qicon.cpp @@ -266,7 +266,7 @@ QPixmap QPixmapIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::St actualSize.scale(size, Qt::KeepAspectRatio); // #### Qt5 no idea what this really does, but we need to remove the QApp and style references - QString key = QLatin1Literal("qt_") + QString key = QLatin1String("qt_") % HexString<quint64>(pm.cacheKey()) % HexString<uint>(pe->mode) % HexString<quint64>(QApplication::palette().cacheKey()) diff --git a/src/widgets/kernel/qiconloader.cpp b/src/widgets/kernel/qiconloader.cpp index a0ee95c80c..e1828fd1f1 100644 --- a/src/widgets/kernel/qiconloader.cpp +++ b/src/widgets/kernel/qiconloader.cpp @@ -507,7 +507,7 @@ QPixmap PixmapEntry::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State st basePixmap.load(filename); int actualSize = qMin(size.width(), size.height()); - QString key = QLatin1Literal("$qt_theme_") + QString key = QLatin1String("$qt_theme_") % HexString<qint64>(basePixmap.cacheKey()) % HexString<int>(mode) % HexString<qint64>(qApp->palette().cacheKey()) diff --git a/src/widgets/styles/qgtkstyle.cpp b/src/widgets/styles/qgtkstyle.cpp index 87d335baad..dbaee40913 100644 --- a/src/widgets/styles/qgtkstyle.cpp +++ b/src/widgets/styles/qgtkstyle.cpp @@ -707,7 +707,7 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element, // thin rectangular images const int pmSize = 64; const int border = proxy()->pixelMetric(PM_DefaultFrameWidth, option, widget); - const QString pmKey = QLatin1Literal("windowframe") % HexString<uint>(option->state); + const QString pmKey = QLatin1String("windowframe") % HexString<uint>(option->state); QPixmap pixmap; QRect pmRect(QPoint(0,0), QSize(pmSize, pmSize)); diff --git a/src/widgets/styles/qplastiquestyle.cpp b/src/widgets/styles/qplastiquestyle.cpp index cae015ff82..51c6c441d0 100644 --- a/src/widgets/styles/qplastiquestyle.cpp +++ b/src/widgets/styles/qplastiquestyle.cpp @@ -487,7 +487,7 @@ static void qBrushSetAlphaF(QBrush *brush, qreal alpha) // Modify the texture - ridiculously expensive. QPixmap texture = brush->texture(); QPixmap pixmap; - QString name = QLatin1Literal("qbrushtexture-alpha") + QString name = QLatin1String("qbrushtexture-alpha") % HexString<qreal>(alpha) % HexString<qint64>(texture.cacheKey()); if (!QPixmapCache::find(name, pixmap)) { @@ -550,7 +550,7 @@ static QBrush qBrushLight(QBrush brush, int light) // Modify the texture - ridiculously expensive. QPixmap texture = brush.texture(); QPixmap pixmap; - QString name = QLatin1Literal("qbrushtexture-light") + QString name = QLatin1String("qbrushtexture-light") % HexString<int>(light) % HexString<qint64>(texture.cacheKey()); @@ -612,7 +612,7 @@ static QBrush qBrushDark(QBrush brush, int dark) // Modify the texture - ridiculously expensive. QPixmap texture = brush.texture(); QPixmap pixmap; - QString name = QLatin1Literal("qbrushtexture-dark") + QString name = QLatin1String("qbrushtexture-dark") % HexString<int>(dark) % HexString<qint64>(texture.cacheKey()); @@ -739,7 +739,7 @@ static QColor mergedColors(const QColor &colorA, const QColor &colorB, int facto static void qt_plastique_draw_gradient(QPainter *painter, const QRect &rect, const QColor &gradientStart, const QColor &gradientStop) { - QString gradientName = QLatin1Literal("qplastique-g") + QString gradientName = QLatin1String("qplastique-g") % HexString<int>(rect.width()) % HexString<int>(rect.height()) % HexString<QRgb>(gradientStart.rgba()) |