1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix build with latest MSVC

Browse Source 
Amend 813bbc515bdd8af843ef56115711691e926d0bcb. Unclear why this
passed CI, but we can't use implicit conversion of string or character
literals.

Change-Id: I1b3515e42b09a5caae1e632320b8251c27177f52
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit 8f3f765dad8757a9307f8b538c0f3af2b7bb245f)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Volker Hilsheimer 2023-07-12 11:16:39 +02:00 committed by Qt Cherry-pick Bot
parent 667a99c322
commit 2eae708fad
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/widgets/styles/qfusionstyle.cpp
View File

@ -1240,7 +1240,7 @@ void QFusionStyle::drawControl(ControlElement element, const QStyleOption *optio
const QString pixmapName = QStyleHelper::uniqueName("headersection-"_L1 const QString pixmapName = QStyleHelper::uniqueName("headersection-"_L1
% HexString(header->position) % HexString(header->position)
% HexString(header->orientation) % HexString(header->orientation)
% (isSectionDragTarget ? '1' : '0'), % QLatin1Char(isSectionDragTarget ? '1' : '0'),
option, option->rect.size()); option, option->rect.size());
QPixmap cache; QPixmap cache;
if (!QPixmapCache::find(pixmapName, &cache)) { if (!QPixmapCache::find(pixmapName, &cache)) {
@ -1955,7 +1955,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
case CC_SpinBox: case CC_SpinBox:
if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) { if (const QStyleOptionSpinBox *spinBox = qstyleoption_cast<const QStyleOptionSpinBox *>(option)) {
QPixmap cache; QPixmap cache;
const QString pixmapName = QStyleHelper::uniqueName("spinbox"_L1, spinBox, spinBox->rect.size()); QString pixmapName = QStyleHelper::uniqueName("spinbox"_L1, spinBox, spinBox->rect.size());
if (!QPixmapCache::find(pixmapName, &cache)) { if (!QPixmapCache::find(pixmapName, &cache)) {
cache = styleCachePixmap(spinBox->rect.size()); cache = styleCachePixmap(spinBox->rect.size());
@ -2666,10 +2666,10 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
bool isEnabled = (comboBox->state & State_Enabled); bool isEnabled = (comboBox->state & State_Enabled);
QPixmap cache; QPixmap cache;
const QString pixmapName = QStyleHelper::uniqueName("combobox"_L1 const QString pixmapName = QStyleHelper::uniqueName("combobox"_L1
% (sunken ? "-sunken" : "") % QLatin1StringView(sunken ? "-sunken" : "")
% (comboBox->editable ? "-editable" : "") % QLatin1StringView(comboBox->editable ? "-editable" : "")
% (isEnabled ? "-enabled" : "") % QLatin1StringView(isEnabled ? "-enabled" : "")
% (!comboBox->frame ? "-frameless" : ""), % QLatin1StringView(!comboBox->frame ? "-frameless" : ""),
option, comboBox->rect.size()); option, comboBox->rect.size());
if (!QPixmapCache::find(pixmapName, &cache)) { if (!QPixmapCache::find(pixmapName, &cache)) {
cache = styleCachePixmap(comboBox->rect.size()); cache = styleCachePixmap(comboBox->rect.size());
@ -2921,7 +2921,7 @@ void QFusionStyle::drawComplexControl(ComplexControl control, const QStyleOption
} }
// draw handle // draw handle
if ((option->subControls & SC_SliderHandle) ) { if ((option->subControls & SC_SliderHandle) ) {
const QString handlePixmapName = QStyleHelper::uniqueName("slider_handle"_L1, option, handle.size()); QString handlePixmapName = QStyleHelper::uniqueName("slider_handle"_L1, option, handle.size());
if (!QPixmapCache::find(handlePixmapName, &cache)) { if (!QPixmapCache::find(handlePixmapName, &cache)) {
cache = styleCachePixmap(handle.size()); cache = styleCachePixmap(handle.size());
cache.fill(Qt::transparent); cache.fill(Qt::transparent);