summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJanne Anttila <janne.anttila@digia.com>2009-08-14 06:47:41 (GMT)
committerJanne Anttila <janne.anttila@digia.com>2009-08-14 06:47:41 (GMT)
commit7d68b34a1f261b2b23400fddcf46d6521eae32d1 (patch)
treed5d4fd32104ccfbca2da7162cc1e69eb39a67f48
parent01ecc29ad3f737fb8e1cc3a33dfa4687cd74c1a5 (diff)
downloadQt-7d68b34a1f261b2b23400fddcf46d6521eae32d1.zip
Qt-7d68b34a1f261b2b23400fddcf46d6521eae32d1.tar.gz
Qt-7d68b34a1f261b2b23400fddcf46d6521eae32d1.tar.bz2
Fixed and re-enabled anguagechange autotest for Symbian.
Started to use QApplication::closeAllWindows instead of unexported QThreadData::current() and friends.
-rw-r--r--tests/auto/_Categories/QtGui.txt2
-rw-r--r--tests/auto/languagechange/tst_languagechange.cpp5
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/_Categories/QtGui.txt b/tests/auto/_Categories/QtGui.txt
index a50dd0c..d8af499 100644
--- a/tests/auto/_Categories/QtGui.txt
+++ b/tests/auto/_Categories/QtGui.txt
@@ -1,6 +1,6 @@
exceptionsafety_objects
#gestures This test is incomplete and also missing from auto.pro -> disabled for now
-#languagechange Uses unexported method QThreadData::current() and also missing from auto.pro -> disabled for now
+languagechange
math3d
modeltest
qabstractbutton
diff --git a/tests/auto/languagechange/tst_languagechange.cpp b/tests/auto/languagechange/tst_languagechange.cpp
index 7cca3bf..7c98809 100644
--- a/tests/auto/languagechange/tst_languagechange.cpp
+++ b/tests/auto/languagechange/tst_languagechange.cpp
@@ -122,10 +122,7 @@ public slots:
void install() {
QCoreApplication::installTranslator(this);
QTest::qWait(2500);
- //### is there any better way to close a Qt dialog?
- QThreadData *data = QThreadData::current();
- if (!data->eventLoops.isEmpty())
- data->eventLoops.top()->quit();
+ QApplication::closeAllWindows();
}
public:
mutable QSet<QByteArray> m_translations;