Bump the moc output revision

Commit aee1f6cc413f56bf4962324799ee3887c3dd037f changed the values of
some built-in meta-type ids. Since the ids of built-in types are
directly encoded -- not as the symbolic QMetaType::Type name, but as
a raw integer -- in the flags for meta-properties, the moc output
prior to that change is incompatible with the current output.

Change-Id: I970484825137a4f19c80726cfe2024e741e3e879
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Reviewed-by: Roberto Raggi <roberto.raggi@nokia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
(cherry picked from commit ca028e1fe07f2fb268d1da73eeaccb0f7f264a04)
Reviewed-by: João Abecasis <joao.abecasis@nokia.com>

diff --git a/src/corelib/kernel/qobjectdefs.h b/src/corelib/kernel/qobjectdefs.h
index 0b1fa88..ec51251 100644 (file)
--- a/src/corelib/kernel/qobjectdefs.h
+++ b/src/corelib/kernel/qobjectdefs.h
@@ -54,7 +54,7 @@ class QByteArray;
 class QString;
 
 #ifndef Q_MOC_OUTPUT_REVISION
-#define Q_MOC_OUTPUT_REVISION 63
+#define Q_MOC_OUTPUT_REVISION 64
 #endif
 
 // The following macros are our "extensions" to C++

diff --git a/src/tools/moc/outputrevision.h b/src/tools/moc/outputrevision.h
index 15661a4..2ce5b9b 100644 (file)
--- a/src/tools/moc/outputrevision.h
+++ b/src/tools/moc/outputrevision.h
@@ -43,6 +43,6 @@
 #define OUTPUTREVISION_H
 
 // if the output revision changes, you MUST change it in qobjectdefs.h too
-enum { mocOutputRevision = 63 };          // moc format output revision
+enum { mocOutputRevision = 64 };          // moc format output revision
 
 #endif // OUTPUTREVISION_H