comparison generator/typesystem_core.xml @ 384:d2f48c4cb3e3

Same behavior of shared libs on linux and windows. Minor build script fixes.
author Max Samukha <maxter@spambox.com>
date Fri, 16 Jul 2010 20:04:29 +0300
parents 7341c47790d4
children
comparison
equal deleted inserted replaced
383:bd7f485e3573 384:d2f48c4cb3e3
1983 <extra-includes> 1983 <extra-includes>
1984 <include file-name="qtd.QMetaTypeImpl" location="java" protection="public"/> 1984 <include file-name="qtd.QMetaTypeImpl" location="java" protection="public"/>
1985 </extra-includes> 1985 </extra-includes>
1986 1986
1987 <inject-code class="native"> 1987 <inject-code class="native">
1988 QTD_EXTERN QTD_DLL_PUBLIC int qtd_QMetaType_registerType(char* namePtr, VoidFunc dtor, VoidFunc ctor) 1988 QTD_EXTERN QTD_EXPORT int qtd_QMetaType_registerType(char* namePtr, VoidFunc dtor, VoidFunc ctor)
1989 { 1989 {
1990 return QMetaType::registerType(namePtr, (QMetaType::Destructor)dtor, (QMetaType::Constructor)ctor); 1990 return QMetaType::registerType(namePtr, (QMetaType::Destructor)dtor, (QMetaType::Constructor)ctor);
1991 } 1991 }
1992 1992
1993 QTD_EXTERN QTD_DLL_PUBLIC void qtd_QMetaType_registerStreamOperators(const char *typeName, VoidFunc saveOp, 1993 QTD_EXTERN QTD_EXPORT void qtd_QMetaType_registerStreamOperators(const char *typeName, VoidFunc saveOp,
1994 VoidFunc loadOp) 1994 VoidFunc loadOp)
1995 { 1995 {
1996 QMetaType::registerStreamOperators(typeName, (QMetaType::SaveOperator)saveOp, 1996 QMetaType::registerStreamOperators(typeName, (QMetaType::SaveOperator)saveOp,
1997 (QMetaType::LoadOperator)loadOp); 1997 (QMetaType::LoadOperator)loadOp);
1998 } 1998 }
2383 </object-type> 2383 </object-type>
2384 2384
2385 <object-type name="QObject"> 2385 <object-type name="QObject">
2386 <inject-code class="native"> 2386 <inject-code class="native">
2387 2387
2388 QTD_EXTERN QTD_DLL_PUBLIC void* qtd_get_d_qobject(void *nativeId) 2388 QTD_EXTERN QTD_EXPORT void* qtd_get_d_qobject(void *nativeId)
2389 { 2389 {
2390 return QObjectEntity::getDId((QObject*)nativeId); 2390 return QObjectEntity::getDId((QObject*)nativeId);
2391 } 2391 }
2392 2392
2393 QTD_EXTERN QTD_DLL_PUBLIC void qtd_create_qobject_entity(void* nativeId, void *dId) 2393 QTD_EXTERN QTD_EXPORT void qtd_create_qobject_entity(void* nativeId, void *dId)
2394 { 2394 {
2395 new QObjectLink((QObject*)nativeId, dId); 2395 new QObjectLink((QObject*)nativeId, dId);
2396 } 2396 }
2397 2397
2398 QTD_EXTERN QTD_DLL_PUBLIC void* qtd_QObject_metaObject(void* nativeId) 2398 QTD_EXTERN QTD_EXPORT void* qtd_QObject_metaObject(void* nativeId)
2399 { 2399 {
2400 return (void*)((QObject*)nativeId)->metaObject(); 2400 return (void*)((QObject*)nativeId)->metaObject();
2401 } 2401 }
2402 2402
2403 </inject-code> 2403 </inject-code>