diff options
author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-05-31 08:51:23 (GMT) |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-02 16:04:53 (GMT) |
commit | 7cbfa66a3e0e03ec559c3b029c817c946bd5c165 (patch) | |
tree | 83968c2224b86472a464e2754d33b9e04460f480 /tests/auto/uic3 | |
parent | 420db97aad3fc1d11b0f1f97c5e9148e829883db (diff) | |
download | Qt-7cbfa66a3e0e03ec559c3b029c817c946bd5c165.zip Qt-7cbfa66a3e0e03ec559c3b029c817c946bd5c165.tar.gz Qt-7cbfa66a3e0e03ec559c3b029c817c946bd5c165.tar.bz2 |
Windows: Fix uic3 autotest.
After 39f2c09d9154e00409c73c6f6db90a4ddb06b8f0,
Windows applications of type Gui/Tty (uic3) would emit many
"QPixmap: Cannot create a QPixmap when no GUI is being used"
when initializing the cursor cache, breaking the stderr
checking of the test.
Task-number: QTQAINFRA-428
Change-Id: Iac74fd7af905e462ac2063c58dfcd91a6b0759a7
Reviewed-by: Sergio Ahumada <sergio.ahumada@nokia.com>
Reviewed-by: Samuel Rødal <samuel.rodal@nokia.com>
Diffstat (limited to 'tests/auto/uic3')
-rw-r--r-- | tests/auto/uic3/tst_uic3.cpp | 3 | ||||
-rw-r--r-- | tests/auto/uic3/uic3.pro | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/tests/auto/uic3/tst_uic3.cpp b/tests/auto/uic3/tst_uic3.cpp index e5b81a1..7e7fa01 100644 --- a/tests/auto/uic3/tst_uic3.cpp +++ b/tests/auto/uic3/tst_uic3.cpp @@ -41,6 +41,7 @@ #include <QtCore/QDir> +#include <QtGui/QApplication> #include <QtTest/QtTest> #include <QtCore/QProcess> #include <QtCore/QByteArray> @@ -184,7 +185,7 @@ QString tst_uic3::workingDir() const return QDir::cleanPath(SRCDIR); } -QTEST_APPLESS_MAIN(tst_uic3) +QTEST_MAIN(tst_uic3) #include "tst_uic3.moc" #else QTEST_NOOP_MAIN diff --git a/tests/auto/uic3/uic3.pro b/tests/auto/uic3/uic3.pro index 9cb0df9..02af16d 100644 --- a/tests/auto/uic3/uic3.pro +++ b/tests/auto/uic3/uic3.pro @@ -8,5 +8,3 @@ TARGET = tst_uic3 DEFINES += SRCDIR=\\\"$$PWD\\\" requires(contains(QT_CONFIG,qt3support)) - -win32:CONFIG+=insignificant_test # QTQAINFRA-428 |