whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the qfatal for redeclaring a type with the same name a warning. 

Change-Id: I5a25b2043a6b5a598a004d30c9a8056564c136e3
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@digia.com>
bb10
Richard J. Moore 2013-06-23 22:37:31 +01:00 committed by The Qt Project
parent 61d7be4420
commit 9c46cdc2db
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/corelib/kernel/qmetatype.cpp
View File

@ -965,11 +965,11 @@ int QMetaType::registerNormalizedTypedef(const NS(QByteArray) &normalizedTypeNam
}
if (idx != aliasId) {
qFatal("QMetaType::registerTypedef: Binary compatibility break "
"-- Type name '%s' previously registered as typedef of '%s' [%i], "
"now registering as typedef of '%s' [%i].",
normalizedTypeName.constData(), QMetaType::typeName(idx), idx,
QMetaType::typeName(aliasId), aliasId);
qWarning("QMetaType::registerTypedef: "
"-- Type name '%s' previously registered as typedef of '%s' [%i], "
"now registering as typedef of '%s' [%i].",
normalizedTypeName.constData(), QMetaType::typeName(idx), idx,
QMetaType::typeName(aliasId), aliasId);
}
return idx;
}