diff options
| author | Jan-Arve Saether <jan-arve.saether@nokia.com> | 2012-07-02 15:11:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-12 18:30:35 +0200 |
| commit | f235ca4079043e6d5e37a204e52e9e482dc4db2c (patch) | |
| tree | 6f53a46a3329e0bc5c5fdc9046f434f09127fb3c /src/corelib/kernel/qtranslator.h | |
| parent | f94d0ea1dca36d5a93c83564cb873537edf6e2c7 (diff) | |
Enable modularization of translation files.
This is accomplished by introducing dependencies to catalogs.
This requires one API change:
QTranslator::load(const uchar *, int);
changes to
QTranslator::load(const uchar*, int len,
const QString &directory = QString());
Since now, even the load from memory might need a directory if
the memory block contains a qm file with dependencies.
Change-Id: I781f333d07f53bb431d0a7b5fa1abe282dc4d338
Task-number: QTBUG-26138
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/corelib/kernel/qtranslator.h')
| -rw-r--r-- | src/corelib/kernel/qtranslator.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/corelib/kernel/qtranslator.h b/src/corelib/kernel/qtranslator.h index f52db59201..8ddf995a92 100644 --- a/src/corelib/kernel/qtranslator.h +++ b/src/corelib/kernel/qtranslator.h @@ -76,7 +76,7 @@ public: const QString & prefix = QString(), const QString & directory = QString(), const QString & suffix = QString()); - bool load(const uchar *data, int len); + bool load(const uchar *data, int len, const QString &directory = QString()); private: Q_DISABLE_COPY(QTranslator) |