Mercurial > projects > qtd
diff 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 |
line wrap: on
line diff
--- a/generator/typesystem_core.xml Mon Jul 12 22:50:58 2010 +0300 +++ b/generator/typesystem_core.xml Fri Jul 16 20:04:29 2010 +0300 @@ -1985,12 +1985,12 @@ </extra-includes> <inject-code class="native"> -QTD_EXTERN QTD_DLL_PUBLIC int qtd_QMetaType_registerType(char* namePtr, VoidFunc dtor, VoidFunc ctor) +QTD_EXTERN QTD_EXPORT int qtd_QMetaType_registerType(char* namePtr, VoidFunc dtor, VoidFunc ctor) { return QMetaType::registerType(namePtr, (QMetaType::Destructor)dtor, (QMetaType::Constructor)ctor); } -QTD_EXTERN QTD_DLL_PUBLIC void qtd_QMetaType_registerStreamOperators(const char *typeName, VoidFunc saveOp, +QTD_EXTERN QTD_EXPORT void qtd_QMetaType_registerStreamOperators(const char *typeName, VoidFunc saveOp, VoidFunc loadOp) { QMetaType::registerStreamOperators(typeName, (QMetaType::SaveOperator)saveOp, @@ -2385,17 +2385,17 @@ <object-type name="QObject"> <inject-code class="native"> -QTD_EXTERN QTD_DLL_PUBLIC void* qtd_get_d_qobject(void *nativeId) +QTD_EXTERN QTD_EXPORT void* qtd_get_d_qobject(void *nativeId) { return QObjectEntity::getDId((QObject*)nativeId); } -QTD_EXTERN QTD_DLL_PUBLIC void qtd_create_qobject_entity(void* nativeId, void *dId) +QTD_EXTERN QTD_EXPORT void qtd_create_qobject_entity(void* nativeId, void *dId) { new QObjectLink((QObject*)nativeId, dId); } -QTD_EXTERN QTD_DLL_PUBLIC void* qtd_QObject_metaObject(void* nativeId) +QTD_EXTERN QTD_EXPORT void* qtd_QObject_metaObject(void* nativeId) { return (void*)((QObject*)nativeId)->metaObject(); }