summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoão Abecasis <joao.abecasis@nokia.com>2012-03-22 01:38:48 +0100
committerQt by Nokia <qt-info@nokia.com>2012-03-28 00:44:16 +0200
commit2e92714090f19c9a1f47565e8b6eecceb0a50425 (patch)
tree208885977dfce1c6f802d273b70625b6d18ef3a4
parenta30ee4598f9c4335126f8c656767d649b3b18848 (diff)
Make QTranslator testcase independent of Widgets
There isn't really a need for the dependency as LanguageChange events can be caught in QObject::eventFilter, directly. Change-Id: I39778fbe1663924d97705b514ae399cfd3749776 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
-rw-r--r--tests/auto/corelib/kernel/qtranslator/qtranslator.pro4
-rw-r--r--tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp12
2 files changed, 7 insertions, 9 deletions
diff --git a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
index c644f83a22..41c3dea924 100644
--- a/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
+++ b/tests/auto/corelib/kernel/qtranslator/qtranslator.pro
@@ -1,6 +1,6 @@
-CONFIG += testcase
+CONFIG += testcase parallel_test
TARGET = tst_qtranslator
-QT += widgets testlib
+QT = core testlib
SOURCES = tst_qtranslator.cpp
RESOURCES += qtranslator.qrc
diff --git a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
index 033d10001f..4689fc432a 100644
--- a/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
+++ b/tests/auto/corelib/kernel/qtranslator/tst_qtranslator.cpp
@@ -40,18 +40,17 @@
****************************************************************************/
#include <QtTest/QtTest>
-#include <QWidget>
#include <qtranslator.h>
#include <qfile.h>
-class tst_QTranslator : public QWidget
+class tst_QTranslator : public QObject
{
Q_OBJECT
public:
tst_QTranslator();
protected:
- bool event(QEvent *event);
+ bool eventFilter(QObject *obj, QEvent *event);
private slots:
void initTestCase();
@@ -71,8 +70,7 @@ private:
tst_QTranslator::tst_QTranslator()
: languageChangeEventCounter(0)
{
- show();
- hide();
+ qApp->installEventFilter(this);
}
void tst_QTranslator::initTestCase()
@@ -83,11 +81,11 @@ void tst_QTranslator::initTestCase()
QVERIFY2(QDir::setCurrent(testdata_dir), qPrintable("Could not chdir to " + testdata_dir));
}
-bool tst_QTranslator::event(QEvent *event)
+bool tst_QTranslator::eventFilter(QObject *, QEvent *event)
{
if (event->type() == QEvent::LanguageChange)
++languageChangeEventCounter;
- return QWidget::event(event);
+ return false;
}
void tst_QTranslator::load()