diff options
| author | David Faure <faure@kde.org> | 2013-02-04 16:25:55 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-04 16:59:12 +0100 |
| commit | 479c0ce877a4d43a2e86f59d70cf8b01ff3f8a70 (patch) | |
| tree | 968e599ec6d4560f5489042e23b4d67b72a79bed /tests/auto/qx11info/tst_qx11info.cpp | |
| parent | 23edef9908802c0b25e73821ac33e578c7acee96 (diff) | |
| download | qtx11extras-479c0ce877a4d43a2e86f59d70cf8b01ff3f8a70.tar.gz | |
QX11Info: return unsigned long rather than Qt::HANDLE.
Qt::HANDLE has changed from unsigned long (on X11) to void* (everywhere)
in Qt5, so we have to use "unsigned long" explicitly here.
Change-Id: I4b16d1492dcb43fde5a4637d33f049854bec898a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/qx11info/tst_qx11info.cpp')
| -rw-r--r-- | tests/auto/qx11info/tst_qx11info.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp index 115de70..b680834 100644 --- a/tests/auto/qx11info/tst_qx11info.cpp +++ b/tests/auto/qx11info/tst_qx11info.cpp @@ -81,8 +81,8 @@ void tst_QX11Info::staticFunctionsBeforeQApplication() void *appVisual = QX11Info::appVisual(); QCOMPARE(appVisual, static_cast<void *>(0)); #endif - Qt::HANDLE appRootWindow = QX11Info::appRootWindow(); - QCOMPARE(appRootWindow, static_cast<Qt::HANDLE>(0)); + unsigned long appRootWindow = QX11Info::appRootWindow(); + QCOMPARE(appRootWindow, static_cast<unsigned long>(0)); #if 0 bool appDefaultColormap = QX11Info::appDefaultColormap(); |