diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-01-11 15:09:05 +0100 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2017-01-12 14:10:03 +0000 |
commit | a3f29495ca6ea4059d09e241c8431776a08e17be (patch) | |
tree | 2b79b4d5de26edd6c585a9ba90485b217d4e69c2 | |
parent | 7fe32567c75b6b9985b9efbecf74477c9e829fb2 (diff) |
Fix build with a namespaced build of Qt
Task-number: PYSIDE-431
Change-Id: I335cfac90df9eedf2455da6e2e197daa00e4913b
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r-- | pylupdate/metatranslator.h | 2 | ||||
-rw-r--r-- | pylupdate/translator.h | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/pylupdate/metatranslator.h b/pylupdate/metatranslator.h index 2b0fa8b..8575351 100644 --- a/pylupdate/metatranslator.h +++ b/pylupdate/metatranslator.h @@ -33,7 +33,7 @@ #include <qlocale.h> #include <qdir.h> -class QTextCodec; +QT_FORWARD_DECLARE_CLASS(QTextCodec) class MetaTranslatorMessage : public TranslatorMessage { diff --git a/pylupdate/translator.h b/pylupdate/translator.h index 89e684e..d0cd4e7 100644 --- a/pylupdate/translator.h +++ b/pylupdate/translator.h @@ -33,7 +33,6 @@ #include <qtranslator.h> class TranslatorPrivate; -template <typename T> class QList; class TranslatorMessage { @@ -95,7 +94,10 @@ private: Tag_Hash, Tag_SourceText, Tag_Context, Tag_Comment, Tag_Obsolete1 }; }; + +QT_BEGIN_NAMESPACE Q_DECLARE_TYPEINFO(TranslatorMessage, Q_MOVABLE_TYPE); +QT_END_NAMESPACE inline void TranslatorMessage::setTranslations(const QStringList &translations) { m_translations = translations; } |