diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-24 08:42:03 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-02-24 14:00:26 +0100 |
| commit | 1128e0bea1dbe8578cd71385ef3c7231aee80e1e (patch) | |
| tree | 8dd0ebcf45ca49cd62674da3839394bc896c76af /src/corelib/kernel/qsystemsemaphore_systemv.cpp | |
| parent | 3be3848338040f4178ed5a450d98eed883b79cb3 (diff) | |
QSystemSemaphore: Fix broken translated messages
Add Q_DECLARE_TR_FUNCTIONS() and use tr().
Pick-to: 6.1
Change-Id: I31a27afa06ee2a592a7e588283e5ff08b5d14f3b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de>
Diffstat (limited to 'src/corelib/kernel/qsystemsemaphore_systemv.cpp')
| -rw-r--r-- | src/corelib/kernel/qsystemsemaphore_systemv.cpp | 27 |
1 files changed, 6 insertions, 21 deletions
diff --git a/src/corelib/kernel/qsystemsemaphore_systemv.cpp b/src/corelib/kernel/qsystemsemaphore_systemv.cpp index 2c38d74d2d..d861a35358 100644 --- a/src/corelib/kernel/qsystemsemaphore_systemv.cpp +++ b/src/corelib/kernel/qsystemsemaphore_systemv.cpp @@ -72,13 +72,8 @@ QT_BEGIN_NAMESPACE key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) { if (key.isEmpty()){ - errorString = -#if QT_CONFIG(translation) - QCoreApplication::tr("%1: key is empty", "QSystemSemaphore") -#else - QLatin1String("%1: key is empty") -#endif - .arg(QLatin1String("QSystemSemaphore::handle:")); + errorString = QSystemSemaphore::tr("%1: key is empty") + .arg(QLatin1String("QSystemSemaphore::handle:")); error = QSystemSemaphore::KeyError; return -1; } @@ -90,13 +85,8 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) // Create the file needed for ftok int built = QSharedMemoryPrivate::createUnixKeyFile(fileName); if (-1 == built) { - errorString = -#if QT_CONFIG(translation) - QCoreApplication::tr("%1: unable to make key", "QSystemSemaphore") -#else - QLatin1String("%1: unable to make key") -#endif - .arg(QLatin1String("QSystemSemaphore::handle:")); + errorString = QSystemSemaphore::tr("%1: unable to make key") + .arg(QLatin1String("QSystemSemaphore::handle:")); error = QSystemSemaphore::KeyError; return -1; } @@ -107,13 +97,8 @@ key_t QSystemSemaphorePrivate::handle(QSystemSemaphore::AccessMode mode) unix_key = ftok(QFile::encodeName(fileName).constData(), 'Q'); #endif if (-1 == unix_key) { - errorString = -#if QT_CONFIG(translation) - QCoreApplication::tr("%1: ftok failed", "QSystemSemaphore") -#else - QLatin1String("%1: ftok failed") -#endif - .arg(QLatin1String("QSystemSemaphore::handle:")); + errorString = QSystemSemaphore::tr("%1: ftok failed") + .arg(QLatin1String("QSystemSemaphore::handle:")); error = QSystemSemaphore::KeyError; return -1; } |