summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/corelib/kernel/qtranslator.cpp4
-rwxr-xr-xtests/auto/test.pl2
2 files changed, 2 insertions, 4 deletions
diff --git a/src/corelib/kernel/qtranslator.cpp b/src/corelib/kernel/qtranslator.cpp
index 3e4b467..5ba9898 100644
--- a/src/corelib/kernel/qtranslator.cpp
+++ b/src/corelib/kernel/qtranslator.cpp
@@ -206,8 +206,6 @@ static int numerusHelper(int n, const uchar *rules, int rulesSize)
return -1;
}
-extern bool qt_detectRTLLanguage();
-
class QTranslatorPrivate : public QObjectPrivate
{
Q_DECLARE_PUBLIC(QTranslator)
@@ -348,7 +346,7 @@ QTranslator::QTranslator(QObject * parent, const char * name)
QTranslator::~QTranslator()
{
if (QCoreApplication::instance())
- QCoreApplication::instance()->removeTranslator(this);
+ QCoreApplication::removeTranslator(this);
Q_D(QTranslator);
d->clear();
}
diff --git a/tests/auto/test.pl b/tests/auto/test.pl
index f2a1fe4..9fd5c9d 100755
--- a/tests/auto/test.pl
+++ b/tests/auto/test.pl
@@ -179,7 +179,7 @@ print " Tests started: $totalStarted \n";
print " Tests executed: $totalExecuted \n";
print " Tests timed out: $totalTimedOut \n";
-# This procedure takes care of handling death children on due time
+# This procedure takes care of handling dead children on due time
sub handleDeath {
$buryChildren = 1;
}