From 479c0ce877a4d43a2e86f59d70cf8b01ff3f8a70 Mon Sep 17 00:00:00 2001 From: David Faure Date: Mon, 4 Feb 2013 16:25:55 +0100 Subject: 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 --- tests/auto/qx11info/tst_qx11info.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'tests/auto/qx11info') 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(0)); #endif - Qt::HANDLE appRootWindow = QX11Info::appRootWindow(); - QCOMPARE(appRootWindow, static_cast(0)); + unsigned long appRootWindow = QX11Info::appRootWindow(); + QCOMPARE(appRootWindow, static_cast(0)); #if 0 bool appDefaultColormap = QX11Info::appDefaultColormap(); -- cgit v1.2.1