1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump the moc output revision

Browse Source 
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>
This commit is contained in:
Kent Hansen 2012-02-23 13:52:16 +01:00 committed by Qt by Nokia
parent 553ffa0118
commit ca028e1fe0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qobjectdefs.h
View File

@ -54,7 +54,7 @@ class QByteArray;
class QString; class QString;
#ifndef Q_MOC_OUTPUT_REVISION #ifndef Q_MOC_OUTPUT_REVISION
#define Q_MOC_OUTPUT_REVISION 63 #define Q_MOC_OUTPUT_REVISION 64
#endif #endif
// The following macros are our "extensions" to C++ // The following macros are our "extensions" to C++

2
src/tools/moc/outputrevision.h
View File

@ -43,6 +43,6 @@
#define OUTPUTREVISION_H #define OUTPUTREVISION_H
// if the output revision changes, you MUST change it in qobjectdefs.h too // 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 #endif // OUTPUTREVISION_H