diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-25 11:45:08 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-25 11:46:48 (GMT) |
| commit | c361eb5bfc7613b9b584d1b58d5d372000f2a47d (patch) | |
| tree | abafa7f45acb13c6acb1b5b2d76208f18ced4bd3 | |
| parent | 43f24759e063df96d01785061bb0905d0352d36b (diff) | |
| download | Qt-c361eb5bfc7613b9b584d1b58d5d372000f2a47d.zip Qt-c361eb5bfc7613b9b584d1b58d5d372000f2a47d.tar.gz Qt-c361eb5bfc7613b9b584d1b58d5d372000f2a47d.tar.bz2 | |
fix class/struct mismatch in the bootstrap magic
qlocale.h includes qobjectdefs.h which forward-declares it as a class.
Reviewed-by: aportale
| -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) |