diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-01-06 15:40:15 (GMT) |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-01-06 18:32:56 (GMT) |
| commit | 48194c74d3e2d2316fa4c57cf8b2e6687d8d6416 (patch) | |
| tree | 89fc685c28300fac099e267e0dd0f13ec4355f17 /src | |
| parent | 6f83ee60cf616731fb37d7a4357fc264fc167b2e (diff) | |
| download | Qt-48194c74d3e2d2316fa4c57cf8b2e6687d8d6416.zip Qt-48194c74d3e2d2316fa4c57cf8b2e6687d8d6416.tar.gz Qt-48194c74d3e2d2316fa4c57cf8b2e6687d8d6416.tar.bz2 | |
Fix compilation with QDND_DEBUG.
Task-number: QTBUG-43466
Change-Id: I9a8ef1f33635469f12d259af9716eb60b650a9de
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qdnd.cpp | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qdnd_win.cpp | 6 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/gui/kernel/qdnd.cpp b/src/gui/kernel/qdnd.cpp index effd941..424cd7b 100644 --- a/src/gui/kernel/qdnd.cpp +++ b/src/gui/kernel/qdnd.cpp @@ -196,7 +196,7 @@ Qt::DropAction QDragManager::defaultAction(Qt::DropActions possibleActions, { #ifdef QDND_DEBUG qDebug("QDragManager::defaultAction(Qt::DropActions possibleActions)"); - qDebug("keyboard modifiers : %s", KeyboardModifiersToString(modifiers).latin1()); + qDebug("keyboard modifiers : %s", qPrintable(KeyboardModifiersToString(modifiers))); #endif QDragPrivate *d = dragPrivate(); @@ -235,7 +235,7 @@ Qt::DropAction QDragManager::defaultAction(Qt::DropActions possibleActions, possibleActions = object->d_func()->possible_actions; #ifdef QDND_DEBUG - qDebug("possible actions : %s", dragActionsToString(possibleActions).latin1()); + qDebug("possible actions : %s", qPrintable(dragActionsToString(possibleActions))); #endif // Check if the action determined is allowed @@ -251,7 +251,7 @@ Qt::DropAction QDragManager::defaultAction(Qt::DropActions possibleActions, } #ifdef QDND_DEBUG - qDebug("default action : %s", dragActionsToString(defaultAction).latin1()); + qDebug("default action : %s", qPrintable(dragActionsToString(defaultAction))); #endif return defaultAction; diff --git a/src/gui/kernel/qdnd_win.cpp b/src/gui/kernel/qdnd_win.cpp index 51d0437..47d5ecd 100644 --- a/src/gui/kernel/qdnd_win.cpp +++ b/src/gui/kernel/qdnd_win.cpp @@ -632,7 +632,8 @@ QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP QOleDropTarget::DragEnter(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) { #ifdef QDND_DEBUG - qDebug("QOleDropTarget::DragEnter(LPDATAOBJECT pDataObj, DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect)"); + qDebug("QOleDropTarget::DragEnter(grfKeyState %d, pt (%d,%d), pdwEffect %lu)", + grfKeyState, pt.x, pt.y, *pdwEffect); #endif if (!QApplicationPrivate::tryModalHelper(widget)) { @@ -699,7 +700,8 @@ QT_ENSURE_STACK_ALIGNED_FOR_SSE STDMETHODIMP QOleDropTarget::DragOver(DWORD grfKeyState, POINTL pt, LPDWORD pdwEffect) { #ifdef QDND_DEBUG - qDebug("QOleDropTarget::DragOver(grfKeyState %d, pt (%d,%d), pdwEffect %d)", grfKeyState, pt.x, pt.y, pdwEffect); + qDebug("QOleDropTarget::DragOver(grfKeyState %d, pt (%d,%d), pdwEffect %lu)", + grfKeyState, pt.x, pt.y, *pdwEffect); #endif QWidget *dragOverWidget = widget->childAt(widget->mapFromGlobal(QPoint(pt.x, pt.y))); |