diff options
author | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-02-08 15:21:02 +0100 |
---|---|---|
committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2021-02-15 15:02:03 +0100 |
commit | 14dd6e972c4fa95addd955f669d8506faddc0e58 (patch) | |
tree | c63f912b2cb34909c1b51522b1fa42950827c0b6 /tools | |
parent | 1cc323065faa3285dda5a6b3f9314b498016a8f9 (diff) |
Fix compilation with Qt 6
Task-number: QTBUG-90685
Change-Id: Iba9ee0a28ec0ceeca5ae318204deb14190042533
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Brett Stottlemyer <bstottle@ford.com>
Diffstat (limited to 'tools')
-rw-r--r-- | tools/repc/cppcodegenerator.cpp | 1 | ||||
-rw-r--r-- | tools/repc/repcodegenerator.cpp | 20 | ||||
-rw-r--r-- | tools/repc/repcodegenerator.h | 2 |
3 files changed, 2 insertions, 21 deletions
diff --git a/tools/repc/cppcodegenerator.cpp b/tools/repc/cppcodegenerator.cpp index 236c7f1..c82acbb 100644 --- a/tools/repc/cppcodegenerator.cpp +++ b/tools/repc/cppcodegenerator.cpp @@ -26,6 +26,7 @@ ** ****************************************************************************/ +#include <qiodevice.h> #include <qjsonarray.h> #include <qjsonvalue.h> diff --git a/tools/repc/repcodegenerator.cpp b/tools/repc/repcodegenerator.cpp index 0da307e..f27346a 100644 --- a/tools/repc/repcodegenerator.cpp +++ b/tools/repc/repcodegenerator.cpp @@ -202,8 +202,7 @@ void RepCodeGenerator::generate(const AST &ast, Mode mode, QString fileName) for (const PODAttribute &attribute : pod.attributes) metaTypes << attribute.type; } - const QString metaTypeRegistrationCode = generateMetaTypeRegistration(metaTypes) - + generateMetaTypeRegistrationForEnums(ast.enumUses); + const QString metaTypeRegistrationCode = generateMetaTypeRegistration(metaTypes); for (const ASTClass &astClass : ast.classes) { QSet<QString> classMetaTypes; @@ -555,7 +554,6 @@ QString RepCodeGenerator::generateMetaTypeRegistration(const QSet<QString> &meta { QString out; const QString qRegisterMetaType = QStringLiteral(" qRegisterMetaType<"); - const QString qRegisterMetaTypeStreamOperators = QStringLiteral(" qRegisterMetaTypeStreamOperators<"); const QString lineEnding = QStringLiteral(">();\n"); for (const QString &metaType : metaTypes) { if (isBuiltinType(metaType)) @@ -564,10 +562,6 @@ QString RepCodeGenerator::generateMetaTypeRegistration(const QSet<QString> &meta out += qRegisterMetaType; out += metaType; out += lineEnding; - - out += qRegisterMetaTypeStreamOperators; - out += metaType; - out += lineEnding; } return out; } @@ -588,18 +582,6 @@ QString RepCodeGenerator::generateMetaTypeRegistrationForPending(const QSet<QStr return out; } - -QString RepCodeGenerator::generateMetaTypeRegistrationForEnums(const QVector<QString> &enumUses) -{ - QString out; - - for (const QString &enumName : enumUses) { - out += QLatin1String(" qRegisterMetaTypeStreamOperators<") + enumName + QLatin1String(">(\"") + enumName + QLatin1String("\");\n"); - } - - return out; -} - void RepCodeGenerator::generateStreamOperatorsForEnums(QTextStream &out, const QVector<QString> &enumUses) { out << "QT_BEGIN_NAMESPACE" << Qt::endl; diff --git a/tools/repc/repcodegenerator.h b/tools/repc/repcodegenerator.h index be3353d..f3f5b4b 100644 --- a/tools/repc/repcodegenerator.h +++ b/tools/repc/repcodegenerator.h @@ -41,7 +41,6 @@ struct ASTEnum; struct ASTProperty; class QIODevice; -class QStringList; class QTextStream; class RepCodeGenerator @@ -64,7 +63,6 @@ private: void generateHeader(Mode mode, QTextStream &out, const AST &ast); QString generateMetaTypeRegistration(const QSet<QString> &metaTypes); QString generateMetaTypeRegistrationForPending(const QSet<QString> &metaTypes); - QString generateMetaTypeRegistrationForEnums(const QVector<QString> &enums); void generateStreamOperatorsForEnums(QTextStream &out, const QVector<QString> &enums); void generateSimpleSetter(QTextStream &out, const ASTProperty &property, bool generateOverride = true); |