summaryrefslogtreecommitdiffstats
path: root/tests/auto/tools
diff options
context:
space:
mode:
authorRohan McGovern <rohan.mcgovern@nokia.com>2012-06-05 14:03:35 +1000
committerQt by Nokia <qt-info@nokia.com>2012-06-05 06:12:20 +0200
commit1668c47608dc2b83c62ef76e97361b11b35a92a7 (patch)
tree8e9e35c78373c39a67eb846e46e09e8fcd1895cc /tests/auto/tools
parentb46d8240ead50791ff391214f922d8036bc50ef7 (diff)
Replace QTEST_APPLESS_MAIN with QTEST_MAIN in tests using QProcess
QProcess requires an application object to be created in order to work correctly on Windows. Task-number: QTBUG-26023 Task-number: QTBUG-26024 Change-Id: Ifa90946262bc7e2a7df6b6aad54e10b54473fc97 Reviewed-by: Toby Tomkins <toby.tomkins@nokia.com>
Diffstat (limited to 'tests/auto/tools')
-rw-r--r--tests/auto/tools/moc/tst_moc.cpp2
-rw-r--r--tests/auto/tools/rcc/tst_rcc.cpp2
-rw-r--r--tests/auto/tools/uic/tst_uic.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/tools/moc/tst_moc.cpp b/tests/auto/tools/moc/tst_moc.cpp
index 1bf016d6f5..d29e42cf93 100644
--- a/tests/auto/tools/moc/tst_moc.cpp
+++ b/tests/auto/tools/moc/tst_moc.cpp
@@ -1920,6 +1920,6 @@ void tst_Moc::redefinedNames()
}
-QTEST_APPLESS_MAIN(tst_Moc)
+QTEST_MAIN(tst_Moc)
#include "tst_moc.moc"
diff --git a/tests/auto/tools/rcc/tst_rcc.cpp b/tests/auto/tools/rcc/tst_rcc.cpp
index d0806bd199..138a7ffc4d 100644
--- a/tests/auto/tools/rcc/tst_rcc.cpp
+++ b/tests/auto/tools/rcc/tst_rcc.cpp
@@ -361,6 +361,6 @@ void tst_rcc::cleanupTestCase()
QFile::remove(entry.absoluteFilePath());
}
-QTEST_APPLESS_MAIN(tst_rcc)
+QTEST_MAIN(tst_rcc)
#include "tst_rcc.moc"
diff --git a/tests/auto/tools/uic/tst_uic.cpp b/tests/auto/tools/uic/tst_uic.cpp
index f77d71e64e..f78d2e56ec 100644
--- a/tests/auto/tools/uic/tst_uic.cpp
+++ b/tests/auto/tools/uic/tst_uic.cpp
@@ -210,5 +210,5 @@ QString tst_uic::workingDir() const
return QDir::cleanPath(SRCDIR);
}
-QTEST_APPLESS_MAIN(tst_uic)
+QTEST_MAIN(tst_uic)
#include "tst_uic.moc"