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

QWindowsCursor: compile without feature_imageformat_xpm

Browse Source 
Fix compile with feature_imageformat_xpm = OFF

Change-Id: Id84c2050f27bbe43ae9710f4e23c52cc24dd3370
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
(cherry picked from commit bdf9d703940621ba1074ce4879212a162a50eaf5)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Christian Ehrlicher 2025-04-30 09:17:09 +02:00 committed by Qt Cherry-pick Bot
parent ffd4b96376
commit 48dae6d4df
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/platforms/windows/qwindowscursor.cpp
View File

@ -708,6 +708,7 @@ QPixmap QWindowsCursor::dragDefaultCursor(Qt::DropAction action) const
break; break;
} }
#if QT_CONFIG(imageformat_xpm)
static const char * const ignoreDragCursorXpmC[] = { static const char * const ignoreDragCursorXpmC[] = {
"24 30 3 1", "24 30 3 1",
". c None", ". c None",
@ -743,6 +744,7 @@ QPixmap QWindowsCursor::dragDefaultCursor(Qt::DropAction action) const
"............XaaaaaaaaX..", "............XaaaaaaaaX..",
".............XXaaaaXX...", ".............XXaaaaXX...",
"...............XXXX....."}; "...............XXXX....."};
#endif
if (m_ignoreDragCursor.isNull()) { if (m_ignoreDragCursor.isNull()) {
HCURSOR cursor = LoadCursor(nullptr, IDC_NO); HCURSOR cursor = LoadCursor(nullptr, IDC_NO);
@ -761,8 +763,10 @@ QPixmap QWindowsCursor::dragDefaultCursor(Qt::DropAction action) const
m_ignoreDragCursor = QPixmap::fromImage(colorImage); m_ignoreDragCursor = QPixmap::fromImage(colorImage);
delete [] colorBits; delete [] colorBits;
#if QT_CONFIG(imageformat_xpm)
} else { } else {
m_ignoreDragCursor = QPixmap(ignoreDragCursorXpmC); m_ignoreDragCursor = QPixmap(ignoreDragCursorXpmC);
#endif
} }
DeleteObject(iconInfo.hbmMask); DeleteObject(iconInfo.hbmMask);