diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-11-30 22:58:06 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-11-30 22:58:06 (GMT) |
| commit | 27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d (patch) | |
| tree | 4be868ec6a0a425044bee84f269cfee3bad7c0e6 /tools/linguist/shared/translator.h | |
| parent | 50afd26a657da319bd6e3cff09ac6c8dd44405bf (diff) | |
| parent | 61f2b450560887651b3350e63bdd75609e3b6752 (diff) | |
| download | Qt-27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d.zip Qt-27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d.tar.gz Qt-27e55ed231f2afe5a775c3ea92f2ef4bf1f6a26d.tar.bz2 | |
Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into kinetic-declarativeui
Conflicts:
src/corelib/animation/qabstractanimation.cpp
Diffstat (limited to 'tools/linguist/shared/translator.h')
| -rw-r--r-- | tools/linguist/shared/translator.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/linguist/shared/translator.h b/tools/linguist/shared/translator.h index 353cf9d..fa447a3 100644 --- a/tools/linguist/shared/translator.h +++ b/tools/linguist/shared/translator.h @@ -55,10 +55,12 @@ QT_BEGIN_NAMESPACE #ifdef QT_BOOTSTRAPPED -struct QObject { +class QObject { +public: static QString tr(const char *sourceText, const char * = 0, int n = -1); }; -struct QCoreApplication : public QObject { +class QCoreApplication : public QObject { +public: enum Encoding { CodecForTr }; static QString translate(const char *, const char *sourceText, const char * = 0, Encoding = CodecForTr, int n = -1) |