diff options
Diffstat (limited to 'tools/qscxmlc/moc_patches/moc.h.patch')
| -rw-r--r-- | tools/qscxmlc/moc_patches/moc.h.patch | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/tools/qscxmlc/moc_patches/moc.h.patch b/tools/qscxmlc/moc_patches/moc.h.patch index 4eb3191..a3823a2 100644 --- a/tools/qscxmlc/moc_patches/moc.h.patch +++ b/tools/qscxmlc/moc_patches/moc.h.patch @@ -1,15 +1,6 @@ ---- .upstream/moc.h 2021-03-18 12:30:56.000000000 +0200 -+++ moc.h 2021-03-19 15:59:05.000000000 +0200 -@@ -3,7 +3,7 @@ - ** Copyright (C) 2016 The Qt Company Ltd. - ** Contact: https://www.qt.io/licensing/ - ** --** This file is part of the tools applications of the Qt Toolkit. -+** This file is part of the QtScxml module of the Qt Toolkit. - ** - ** $QT_BEGIN_LICENSE:GPL-EXCEPT$ - ** Commercial License Usage -@@ -29,15 +29,13 @@ +--- .upstream/moc.h 2023-01-09 12:46:39.312781225 +0100 ++++ moc.h 2023-02-14 14:15:40.952143516 +0100 +@@ -4,15 +4,12 @@ #ifndef MOC_H #define MOC_H @@ -28,11 +19,10 @@ +#include <QtCore/qjsondocument.h> +#include <QtCore/qjsonarray.h> +// -- QtScxml -+ - #include <ctype.h> - QT_BEGIN_NAMESPACE -@@ -48,16 +46,18 @@ + #include <private/qtools_p.h> + +@@ -24,16 +21,18 @@ { enum ReferenceType { NoReference, Reference, RValueReference, Pointer }; @@ -53,7 +43,7 @@ ReferenceType referenceType; }; Q_DECLARE_TYPEINFO(Type, Q_RELOCATABLE_TYPE); -@@ -105,8 +105,9 @@ +@@ -81,8 +80,9 @@ bool inlineCode = false; bool wasCloned = false; @@ -64,7 +54,7 @@ bool isCompat = false; bool isInvokable = false; bool isScriptable = false; -@@ -120,6 +121,11 @@ +@@ -96,6 +96,11 @@ QJsonObject toJson() const; static void accessToJson(QJsonObject *obj, Access acs); @@ -76,7 +66,7 @@ }; Q_DECLARE_TYPEINFO(FunctionDef, Q_RELOCATABLE_TYPE); -@@ -144,6 +150,10 @@ +@@ -121,6 +126,10 @@ int location = -1; // token index, used for error reporting QJsonObject toJson() const; @@ -87,7 +77,7 @@ }; Q_DECLARE_TYPEINFO(PropertyDef, Q_RELOCATABLE_TYPE); -@@ -217,6 +227,7 @@ +@@ -194,6 +203,7 @@ }; Q_DECLARE_TYPEINFO(NamespaceDef, Q_RELOCATABLE_TYPE); @@ -95,7 +85,7 @@ class Moc : public Parser { public: -@@ -295,6 +306,7 @@ +@@ -272,6 +282,7 @@ void checkSuperClasses(ClassDef *def); void checkProperties(ClassDef* cdef); }; |