Skip to content

Commit 48194c7

Browse files
Friedemann KleintFriedemann Kleint
authored andcommitted
Fix compilation with QDND_DEBUG.
Task-number: QTBUG-43466 Change-Id: I9a8ef1f33635469f12d259af9716eb60b650a9de Reviewed-by: Joerg Bornemann <[email protected]>
1 parent 6f83ee6 commit 48194c7

File tree

2 files changed

+7
-5
lines changed

2 files changed

+7
-5
lines changed

src/gui/kernel/qdnd.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ Qt::DropAction QDragManager::defaultAction(Qt::DropActions possibleActions,
196196
{
197197
#ifdef QDND_DEBUG
198198
qDebug("QDragManager::defaultAction(Qt::DropActions possibleActions)");
199-
qDebug("keyboard modifiers : %s", KeyboardModifiersToString(modifiers).latin1());
199+
qDebug("keyboard modifiers : %s", qPrintable(KeyboardModifiersToString(modifiers)));
200200
#endif
201201

202202
QDragPrivate *d = dragPrivate();
@@ -235,7 +235,7 @@ Qt::DropAction QDragManager::defaultAction(Qt::DropActions possibleActions,
235235
possibleActions = object->d_func()->possible_actions;
236236

237237
#ifdef QDND_DEBUG
238-
qDebug("possible actions : %s", dragActionsToString(possibleActions).latin1());
238+
qDebug("possible actions : %s", qPrintable(dragActionsToString(possibleActions)));
239239
#endif
240240

241241
// Check if the action determined is allowed
@@ -251,7 +251,7 @@ Qt::DropAction QDragManager::defaultAction(Qt::DropActions possibleActions,
251251
}
252252

253253
#ifdef QDND_DEBUG
254-
qDebug("default action : %s", dragActionsToString(defaultAction).latin1());
254+
qDebug("default action : %s", qPrintable(dragActionsToString(defaultAction)));
255255
#endif
256256

257257
return defaultAction;

src/gui/kernel/qdnd_win.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,8 @@ QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
632632
QOleDropTarget::DragEnter(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
633633
{
634634
#ifdef QDND_DEBUG
635-
qDebug("QOleDropTarget::DragEnter(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)");
635+
qDebug("QOleDropTarget::DragEnter(grfKeyState %d, pt (%d,%d), pdwEffect %lu)",
636+
grfKeyState, pt.x, pt.y, *pdwEffect);
636637
#endif
637638

638639
if (!QApplicationPrivate::tryModalHelper(widget)) {
@@ -699,7 +700,8 @@ QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP
699700
QOleDropTarget::DragOver(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)
700701
{
701702
#ifdef QDND_DEBUG
702-
qDebug("QOleDropTarget::DragOver(grfKeyState %d, pt (%d,%d), pdwEffect %d)", grfKeyState, pt.x, pt.y, pdwEffect);
703+
qDebug("QOleDropTarget::DragOver(grfKeyState %d, pt (%d,%d), pdwEffect %lu)",
704+
grfKeyState, pt.x, pt.y, *pdwEffect);
703705
#endif
704706

705707
QWidget *dragOverWidget = widget->childAt(widget->mapFromGlobal(QPoint(pt.x, pt.y)));

0 commit comments

Comments
 (0)