3 files changed, 127 insertions, 0 deletions
diff --git a/tests/auto/qx11info/.gitignore b/tests/auto/qx11info/.gitignore
new file mode 100644
index 0000000..afe460a
--- /dev/null
+++ b/tests/auto/qx11info/.gitignore
@@ -0,0 +1 @@
+tst_qx11info
diff --git a/tests/auto/qx11info/qx11info.pro b/tests/auto/qx11info/qx11info.pro
new file mode 100644
index 0000000..e87fcf5
--- /dev/null
+++ b/tests/auto/qx11info/qx11info.pro
@@ -0,0 +1,4 @@
+load(qttest_p4)
+SOURCES += tst_qx11info.cpp
+
+
diff --git a/tests/auto/qx11info/tst_qx11info.cpp b/tests/auto/qx11info/tst_qx11info.cpp
new file mode 100644
index 0000000..d2a60f6
--- /dev/null
+++ b/tests/auto/qx11info/tst_qx11info.cpp
@@ -0,0 +1,122 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the test suite of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** 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, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, 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.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+
+#include <QtTest/QtTest>
+
+#ifdef Q_WS_X11
+
+#include <QApplication>
+#include <QX11Info>
+
+class tst_QX11Info : public QObject
+{
+    Q_OBJECT
+
+private slots:
+    void staticFunctionsBeforeQApplication();
+};
+
+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);
+}
+
+QTEST_APPLESS_MAIN(tst_QX11Info)
+
+#include "tst_qx11info.moc"
+
+#else // !Q_WS_X11
+
+QTEST_NOOP_MAIN
+
+#endif