diff options
| author | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-08-25 15:08:20 +0200 |
|---|---|---|
| committer | Fabian Kosmale <fabian.kosmale@qt.io> | 2020-08-25 19:11:03 +0200 |
| commit | 23dd5db4f1f612e962b408c26e9cfd276a5348a3 (patch) | |
| tree | 0da79bb7f3e90cd4dcb381cca654f22510eb985e /src/qml/jsapi | |
| parent | 277869faa33b796d68d4b0dab4970e70ca64a00f (diff) | |
Remove deprecated QJSEngine::installTranslatorFunctions function
[ChangeLog][QJSEngine] The deprecated installTranslatorFunctions() has
been removed.
Use installExtensions() with TranslationExtension instead.
Change-Id: I58345793ea154ec37d0c64f13c958193e6fa461b
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
Diffstat (limited to 'src/qml/jsapi')
| -rw-r--r-- | src/qml/jsapi/qjsengine.cpp | 34 | ||||
| -rw-r--r-- | src/qml/jsapi/qjsengine.h | 4 |
2 files changed, 0 insertions, 38 deletions
diff --git a/src/qml/jsapi/qjsengine.cpp b/src/qml/jsapi/qjsengine.cpp index 70c07e4cb7..15b7682ae2 100644 --- a/src/qml/jsapi/qjsengine.cpp +++ b/src/qml/jsapi/qjsengine.cpp @@ -391,40 +391,6 @@ void QJSEngine::collectGarbage() m_v4Engine->memoryManager->runGC(); } -#if QT_DEPRECATED_SINCE(5, 6) - -/*! - \since 5.4 - \obsolete - - Installs translator functions on the given \a object, or on the Global - Object if no object is specified. - - The relation between script translator functions and C++ translator - functions is described in the following table: - - \table - \header \li Script Function \li Corresponding C++ Function - \row \li qsTr() \li QObject::tr() - \row \li QT_TR_NOOP() \li QT_TR_NOOP() - \row \li qsTranslate() \li QCoreApplication::translate() - \row \li QT_TRANSLATE_NOOP() \li QT_TRANSLATE_NOOP() - \row \li qsTrId() \li qtTrId() - \row \li QT_TRID_NOOP() \li QT_TRID_NOOP() - \endtable - - It also adds an arg() method to the string prototype. - - \sa {Internationalization with Qt} -*/ -void QJSEngine::installTranslatorFunctions(const QJSValue &object) -{ - installExtensions(TranslationExtension, object); -} - -#endif // QT_DEPRECATED_SINCE(5, 6) - - /*! \since 5.6 diff --git a/src/qml/jsapi/qjsengine.h b/src/qml/jsapi/qjsengine.h index 643c5d5a38..a025ce991d 100644 --- a/src/qml/jsapi/qjsengine.h +++ b/src/qml/jsapi/qjsengine.h @@ -104,10 +104,6 @@ public: static void setObjectOwnership(QObject *, ObjectOwnership); static ObjectOwnership objectOwnership(QObject *); -#if QT_DEPRECATED_SINCE(5, 6) - QT_DEPRECATED void installTranslatorFunctions(const QJSValue &object = QJSValue()); -#endif - enum Extension { TranslationExtension = 0x1, ConsoleExtension = 0x2, |