From 1723a9861f5f8eb537b2b39533561a86b5d389f0 Mon Sep 17 00:00:00 2001
From: Bjoern Breitmeyer <bjoern.breitmeyer@kdab.com>
Date: Thu, 16 May 2013 17:35:48 +0200
Subject: Fixed testbuild with QT_NO_CURSOR
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Removed the QCursor entry from the list of types
if QT_NO_CURSOR is set.

Change-Id: I6b8e925acedec75ed6e46b2e3fe34d0011667c91
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
---
 tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'tests')

diff --git a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
index da2c961558..1839b0670c 100644
--- a/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
+++ b/tests/auto/gui/kernel/qguimetatype/tst_qguimetatype.cpp
@@ -66,7 +66,7 @@ private slots:
     void constructCopy();
 };
 
-#define FOR_EACH_GUI_METATYPE(F) \
+#define FOR_EACH_GUI_METATYPE_BASE(F) \
     F(QFont, QFont) \
     F(QPixmap, QPixmap) \
     F(QBrush, QBrush) \
@@ -76,7 +76,6 @@ private slots:
     F(QPolygon, QPolygon) \
     F(QRegion, QRegion) \
     F(QBitmap, QBitmap) \
-    F(QCursor, QCursor) \
     F(QKeySequence, QKeySequence) \
     F(QPen, QPen) \
     F(QTextLength, QTextLength) \
@@ -89,6 +88,16 @@ private slots:
     F(QVector4D, QVector4D) \
     F(QQuaternion, QQuaternion)
 
+#ifndef QTEST_NO_CURSOR
+#   define FOR_EACH_GUI_METATYPE(F) \
+        FOR_EACH_GUI_METATYPE_BASE(F) \
+        F(QCursor, QCursor)
+#else // !QTEST_NO_CURSOR
+#   define FOR_EACH_GUI_METATYPE(F) \
+        FOR_EACH_GUI_METATYPE_BASE(F)
+#endif // !QTEST_NO_CURSOR
+
+
 namespace {
     template <typename T>
     struct static_assert_trigger {
-- 
cgit v1.2.3