Merge pull request #2991 from ey6es/master

Temporarily disable enum streamers, which are crashing on Windows startu...
This commit is contained in:
Andrzej Kapolka 2014-06-05 17:08:31 -07:00
commit ff306e5675

View file

@ -92,13 +92,14 @@ int Bitstream::registerMetaObject(const char* className, const QMetaObject* meta
} }
// register the streamers for all enumerators // register the streamers for all enumerators
for (int i = 0; i < metaObject->enumeratorCount(); i++) { // temporarily disabled: crashes on Windows
QMetaEnum metaEnum = metaObject->enumerator(i); //for (int i = 0; i < metaObject->enumeratorCount(); i++) {
const TypeStreamer*& streamer = getEnumStreamers()[QPair<QByteArray, QByteArray>(metaEnum.scope(), metaEnum.name())]; // QMetaEnum metaEnum = metaObject->enumerator(i);
if (!streamer) { // const TypeStreamer*& streamer = getEnumStreamers()[QPair<QByteArray, QByteArray>(metaEnum.scope(), metaEnum.name())];
getEnumStreamersByName().insert(getEnumName(metaEnum), streamer = new EnumTypeStreamer(metaEnum)); // if (!streamer) {
} // getEnumStreamersByName().insert(getEnumName(metaEnum), streamer = new EnumTypeStreamer(metaEnum));
} // }
//}
return 0; return 0;
} }