summaryrefslogtreecommitdiffstats
path: root/tests/auto/platformquirks.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2012-09-20 15:35:21 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-10-13 05:51:19 +0200
commit6b04ee10e6a17999679de86e80ce66886ceab963 (patch)
treea939a0c9466e90d19ffeffc76bbd592ae2d3489a /tests/auto/platformquirks.h
parentdc0d5bf387a0b440c74b9e822c46b09e20e00720 (diff)
Auto tests: revise cursor dependant tests
Cursor dependant auto tests are currently skipped in various ways. Some are checking PlatformQuirks::haveMouseCursor() that tries to detect if the desktop environment is MeeGo, using obsolete Q_WS_X11. Some are skipped if QT_NO_CURSOR or Q_OS_WINCE is defined and some are actually missing the approriate guards. => unify by defining QTEST_NO_CURSOR in qtest-config.h when appropriate ie. for platforms that have no regular mouse cursor support or when QT_NO_CURSOR is defined. Task-number: QTBUG-22551 Change-Id: I9a1e0e3156617945ae46226c79268955454c8a9a Reviewed-by: Laszlo Papp <lpapp@kde.org> Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'tests/auto/platformquirks.h')
-rw-r--r--tests/auto/platformquirks.h65
1 files changed, 0 insertions, 65 deletions
diff --git a/tests/auto/platformquirks.h b/tests/auto/platformquirks.h
deleted file mode 100644
index 9bd9adda83..0000000000
--- a/tests/auto/platformquirks.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies).
-** Contact: http://www.qt-project.org/legal
-**
-** This file is part of the test suite of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia. For licensing terms and
-** conditions see http://qt.digia.com/licensing. For further information
-** use the contact form at http://qt.digia.com/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** In addition, as a special exception, Digia gives you certain additional
-** rights. These rights are described in the Digia Qt LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 3.0 as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU General Public License version 3.0 requirements will be
-** met: http://www.gnu.org/copyleft/gpl.html.
-**
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef PLATFORMQUIRKS_H
-#define PLATFORMQUIRKS_H
-
-#include <qglobal.h>
-
-#ifdef QT_GUI_LIB
-#include <qapplication.h>
-#endif
-
-
-struct PlatformQuirks
-{
- static inline bool haveMouseCursor()
- {
-#if defined(Q_WS_X11)
- return X11->desktopEnvironment != DE_MEEGO_COMPOSITOR;
-#else
- return true;
-#endif
- }
-};
-
-#endif
-