diff options
Diffstat (limited to 'tests/auto')
-rw-r--r-- | tests/auto/gui.pro | 3 | ||||
-rw-r--r-- | tests/auto/gui/image/qpixmap/tst_qpixmap.cpp | 12 | ||||
-rw-r--r-- | tests/auto/qwindowsurface/tst_qwindowsurface.cpp | 1 | ||||
-rw-r--r-- | tests/auto/qx11info/.gitignore | 1 | ||||
-rw-r--r-- | tests/auto/qx11info/qx11info.pro | 7 | ||||
-rw-r--r-- | tests/auto/qx11info/tst_qx11info.cpp | 127 |
6 files changed, 3 insertions, 148 deletions
diff --git a/tests/auto/gui.pro b/tests/auto/gui.pro index d876873bd4..4f684869f4 100644 --- a/tests/auto/gui.pro +++ b/tests/auto/gui.pro @@ -11,8 +11,7 @@ SUBDIRS=\ qwindowsurface \ qwsembedwidget \ qwsinputmethod \ - qwswindowsystem \ - qx11info \ + qwswindowsystem # This test cannot be run on Mac OS mac*:SUBDIRS -= \ diff --git a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp index 98b8570b12..4be8a40547 100644 --- a/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp +++ b/tests/auto/gui/image/qpixmap/tst_qpixmap.cpp @@ -65,10 +65,6 @@ #include <qscreen_qws.h> #endif -#ifdef Q_WS_X11 -#include <QX11Info> -#endif - //TESTED_CLASS= //TESTED_FILES= @@ -180,10 +176,8 @@ static bool lenientCompare(const QPixmap &actual, const QPixmap &expected) int size = actual.width() * actual.height(); int threshold = 2; -#ifdef Q_WS_X11 - if (QX11Info::appDepth() == 16) + if (QPixmap::defaultDepth() == 16) threshold = 10; -#endif QRgb *a = (QRgb *)actualImage.bits(); QRgb *e = (QRgb *)expectedImage.bits(); @@ -245,10 +239,8 @@ void tst_QPixmap::swap() void tst_QPixmap::fromImage_data() { bool is16bit = false; -#ifdef Q_WS_X11 - if (QX11Info::appDepth() == 16) + if (QPixmap::defaultDepth() == 16) is16bit = true; -#endif QTest::addColumn<QImage::Format>("format"); diff --git a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp index d7e716b4ab..22a0110423 100644 --- a/tests/auto/qwindowsurface/tst_qwindowsurface.cpp +++ b/tests/auto/qwindowsurface/tst_qwindowsurface.cpp @@ -45,7 +45,6 @@ #include <QPalette> #include <QWindowsStyle> #include <QDesktopWidget> -#include <QX11Info> #if QT_VERSION < 0x050000 #include <private/qwindowsurface_p.h> diff --git a/tests/auto/qx11info/.gitignore b/tests/auto/qx11info/.gitignore deleted file mode 100644 index afe460a3a6..0000000000 --- a/tests/auto/qx11info/.gitignore +++ /dev/null @@ -1 +0,0 @@ -tst_qx11info diff --git a/tests/auto/qx11info/qx11info.pro b/tests/auto/qx11info/qx11info.pro deleted file mode 100644 index e9ad008eb5..0000000000 --- a/tests/auto/qx11info/qx11info.pro +++ /dev/null @@ -1,7 +0,0 @@ -CONFIG += testcase -TARGET = tst_qx11info -QT += widgets testlib -SOURCES += tst_qx11info.cpp - - -mac*:CONFIG+=insignificant_test diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp deleted file mode 100644 index 6d0476f88e..0000000000 --- a/tests/auto/qx11info/tst_qx11info.cpp +++ /dev/null @@ -1,127 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include <QtTest/QtTest> -#include <QApplication> -#include <QX11Info> - -class tst_QX11Info : public QObject -{ - Q_OBJECT - -#ifndef Q_WS_X11 -public slots: - void initTestCase(); -#else -private slots: - void staticFunctionsBeforeQApplication(); -#endif -}; - -#ifndef Q_WS_X11 -void tst_QX11Info::initTestCase() -{ - QSKIP("This test is only valid for X11"); -} - -#else - -void tst_QX11Info::staticFunctionsBeforeQApplication() -{ - QVERIFY(!QApplication::instance()); - - // none of these functions should crash if QApplication hasn't - // been constructed - - Display *display = QX11Info::display(); - QCOMPARE(display, (Display *)0); - const char *appClass = QX11Info::appClass(); - QCOMPARE(appClass, (const char *)0); - int appScreen = QX11Info::appScreen(); - QCOMPARE(appScreen, 0); - int appDepth = QX11Info::appDepth(); - QCOMPARE(appDepth, 32); - int appCells = QX11Info::appCells(); - QCOMPARE(appCells, 0); - Qt::HANDLE appColormap = QX11Info::appColormap(); - QCOMPARE(appColormap, static_cast<Qt::HANDLE>(0)); - void *appVisual = QX11Info::appVisual(); - QCOMPARE(appVisual, static_cast<void *>(0)); - Qt::HANDLE appRootWindow = QX11Info::appRootWindow(); - QCOMPARE(appRootWindow, static_cast<Qt::HANDLE>(0)); - - bool appDefaultColormap = QX11Info::appDefaultColormap(); - QCOMPARE(appDefaultColormap, true); - bool appDefaultVisual = QX11Info::appDefaultVisual(); - QCOMPARE(appDefaultVisual, true); - - int appDpiX = QX11Info::appDpiX(); - int appDpiY = QX11Info::appDpiY(); - QCOMPARE(appDpiX, 75); - QCOMPARE(appDpiY, 75); - - // the setAppDpi{X,Y} calls do nothing if QApplication hasn't been - // constructed - QX11Info::setAppDpiX(-1, 120); - QX11Info::setAppDpiY(-1, 120); - appDpiX = QX11Info::appDpiX(); - appDpiY = QX11Info::appDpiY(); - QCOMPARE(appDpiX, 75); - QCOMPARE(appDpiY, 75); - - unsigned long appTime = QX11Info::appTime(); - unsigned long appUserTime = QX11Info::appUserTime(); - QCOMPARE(appTime, 0ul); - QCOMPARE(appTime, 0ul); - // setApp*Time do nothing without QApplication - QX11Info::setAppTime(1234); - QX11Info::setAppUserTime(5678); - appTime = QX11Info::appTime(); - appUserTime = QX11Info::appUserTime(); - QCOMPARE(appTime, 0ul); - QCOMPARE(appTime, 0ul); -} - -#endif - -QTEST_APPLESS_MAIN(tst_QX11Info) -#include "tst_qx11info.moc" |