diff -r 6fbed849b4f4 -r 1f895d8a5b2b qtmobility/src/global/qmobilityglobal.h --- a/qtmobility/src/global/qmobilityglobal.h Wed Jun 23 19:08:38 2010 +0300 +++ b/qtmobility/src/global/qmobilityglobal.h Tue Jul 06 15:12:50 2010 +0300 @@ -64,108 +64,120 @@ #endif #include -#if defined(SYMBIAN_DATABASEMANAGER_SERVER) -# define Q_SERVICEFW_EXPORT -#else -# if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) -# if defined(QT_NODLL) -# undef QT_MAKEDLL +#if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) +# if defined(QT_NODLL) +# undef QT_MAKEDLL +# undef QT_DLL +# elif defined(QT_MAKEDLL) +# if defined(QT_DLL) # undef QT_DLL -# elif defined(QT_MAKEDLL) -# if defined(QT_DLL) -# undef QT_DLL -# endif -# if defined(QT_BUILD_BEARER_LIB) -# define Q_BEARER_EXPORT Q_DECL_EXPORT -# else -# define Q_BEARER_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_CFW_LIB) -# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT -# else -# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_CONTACTS_LIB) -# define Q_CONTACTS_EXPORT Q_DECL_EXPORT -# else -# define Q_CONTACTS_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_VERSIT_LIB) -# define Q_VERSIT_EXPORT Q_DECL_EXPORT -# else -# define Q_VERSIT_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_LOCATION_LIB) -# define Q_LOCATION_EXPORT Q_DECL_EXPORT -# else -# define Q_LOCATION_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_MESSAGING_LIB) -# define Q_MESSAGING_EXPORT Q_DECL_EXPORT -# else -# define Q_MESSAGING_EXPORT Q_DECL_IMPORT -# endif +# endif +# if defined(QT_BUILD_BEARER_LIB) +# define Q_BEARER_EXPORT Q_DECL_EXPORT +# else +# define Q_BEARER_EXPORT Q_DECL_IMPORT +# endif +# if defined(QT_BUILD_CFW_LIB) +# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT +# else +# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT +# endif +# if defined(QT_BUILD_CONTACTS_LIB) +# define Q_CONTACTS_EXPORT Q_DECL_EXPORT +# else +# define Q_CONTACTS_EXPORT Q_DECL_IMPORT +# endif +# if defined(QT_BUILD_VERSIT_LIB) +# define Q_VERSIT_EXPORT Q_DECL_EXPORT +# else +# define Q_VERSIT_EXPORT Q_DECL_IMPORT +# endif +# if defined(QT_BUILD_LOCATION_LIB) +# define Q_LOCATION_EXPORT Q_DECL_EXPORT +# else +# define Q_LOCATION_EXPORT Q_DECL_IMPORT +# endif +# if defined(QT_BUILD_MESSAGING_LIB) +# define Q_MESSAGING_EXPORT Q_DECL_EXPORT +# else +# define Q_MESSAGING_EXPORT Q_DECL_IMPORT +# endif # if defined(QT_BUILD_MULTIMEDIA_LIB) # define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT -# else +# else # define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_SFW_LIB) -# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT -# else -# define Q_SERVICEFW_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_SYSINFO_LIB) -# define Q_SYSINFO_EXPORT Q_DECL_EXPORT -# else -# define Q_SYSINFO_EXPORT Q_DECL_IMPORT -# endif -# if defined(QT_BUILD_SENSORS_LIB) -# define Q_SENSORS_EXPORT Q_DECL_EXPORT -# else -# define Q_SENSORS_EXPORT Q_DECL_IMPORT -# endif -# elif defined(QT_DLL) /* use a Qt DLL library */ -# define Q_BEARER_EXPORT Q_DECL_IMPORT -# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT -# define Q_CONTACTS_EXPORT Q_DECL_IMPORT -# define Q_VERSIT_EXPORT Q_DECL_IMPORT -# define Q_LOCATION_EXPORT Q_DECL_IMPORT -# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT -# define Q_MESSAGING_EXPORT Q_DECL_IMPORT +# endif +# if defined(QT_BUILD_SFW_LIB) +# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT +# else # define Q_SERVICEFW_EXPORT Q_DECL_IMPORT +# endif +# if defined(QT_BUILD_SYSINFO_LIB) +# define Q_SYSINFO_EXPORT Q_DECL_EXPORT +# else # define Q_SYSINFO_EXPORT Q_DECL_IMPORT +# endif +# if defined(QT_BUILD_SENSORS_LIB) +# define Q_SENSORS_EXPORT Q_DECL_EXPORT +# else # define Q_SENSORS_EXPORT Q_DECL_IMPORT # endif -# else +# elif defined(QT_DLL) /* use a Qt DLL library */ +# define Q_BEARER_EXPORT Q_DECL_IMPORT +# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_IMPORT +# define Q_CONTACTS_EXPORT Q_DECL_IMPORT +# define Q_VERSIT_EXPORT Q_DECL_IMPORT +# define Q_LOCATION_EXPORT Q_DECL_IMPORT +# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT +# define Q_MESSAGING_EXPORT Q_DECL_IMPORT +# if QTM_SERVICEFW_SYMBIAN_DATABASEMANAGER_SERVER +# define Q_SERVICEFW_EXPORT +# else +# define Q_SERVICEFW_EXPORT Q_DECL_IMPORT +# endif +# define Q_SYSINFO_EXPORT Q_DECL_IMPORT +# define Q_SENSORS_EXPORT Q_DECL_IMPORT # endif -# if !defined(Q_SERVICEFW_EXPORT) -# if defined(QT_SHARED) -# define Q_BEARER_EXPORT Q_DECL_EXPORT -# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT -# define Q_CONTACTS_EXPORT Q_DECL_EXPORT -# define Q_VERSIT_EXPORT Q_DECL_EXPORT -# define Q_LOCATION_EXPORT Q_DECL_EXPORT -# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT -# define Q_MESSAGING_EXPORT Q_DECL_EXPORT -# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT -# define Q_SYSINFO_EXPORT Q_DECL_EXPORT -# define Q_SENSORS_EXPORT Q_DECL_EXPORT -# else -# define Q_BEARER_EXPORT -# define Q_PUBLISHSUBSCRIBE_EXPORT -# define Q_CONTACTS_EXPORT -# define Q_VERSIT_EXPORT -# define Q_LOCATION_EXPORT -# define Q_MULTIMEDIA_EXPORT -# define Q_MESSAGING_EXPORT -# define Q_SERVICEFW_EXPORT -# define Q_SYSINFO_EXPORT -# define Q_SENSORS_EXPORT -# endif +#endif + +#if !defined(Q_SERVICEFW_EXPORT) +# if defined(QT_SHARED) +# define Q_BEARER_EXPORT Q_DECL_EXPORT +# define Q_PUBLISHSUBSCRIBE_EXPORT Q_DECL_EXPORT +# define Q_CONTACTS_EXPORT Q_DECL_EXPORT +# define Q_VERSIT_EXPORT Q_DECL_EXPORT +# define Q_LOCATION_EXPORT Q_DECL_EXPORT +# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT +# define Q_MESSAGING_EXPORT Q_DECL_EXPORT +# define Q_SERVICEFW_EXPORT Q_DECL_EXPORT +# define Q_SYSINFO_EXPORT Q_DECL_EXPORT +# define Q_SENSORS_EXPORT Q_DECL_EXPORT +# else +# define Q_BEARER_EXPORT +# define Q_PUBLISHSUBSCRIBE_EXPORT +# define Q_CONTACTS_EXPORT +# define Q_VERSIT_EXPORT +# define Q_LOCATION_EXPORT +# define Q_MULTIMEDIA_EXPORT +# define Q_MESSAGING_EXPORT +# define Q_SERVICEFW_EXPORT +# define Q_SYSINFO_EXPORT +# define Q_SENSORS_EXPORT # endif #endif + +#ifdef QTM_SERVICEFW_SYMBIAN_DATABASEMANAGER_SERVER +# ifdef Q_SERVICEFW_EXPORT +# undef Q_SERVICEFW_EXPORT +# endif +# define Q_SERVICEFW_EXPORT +# ifdef Q_AUTOTEST_EXPORT +# undef Q_AUTOTEST_EXPORT +# endif +# define Q_AUTOTEST_EXPORT +#endif + // The namespace is hardcoded as moc has issues resolving // macros which would be a prerequisite for a dynmamic namespace #define QTM_NAMESPACE QtMobility