diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 23:52:06 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-21 23:52:06 (GMT) |
| commit | c70e3f24a97b82f5ce9ad890fa95369e425a31ac (patch) | |
| tree | 432987220d2f7fa2b96a5307d0d8608e7eb184be /src/corelib | |
| parent | 07f131927faa09402589da7b4bfb516482f59e46 (diff) | |
| parent | c05f38f37fbe2192d135881de3dba087ac71ffe1 (diff) | |
| download | Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.zip Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.tar.gz Qt-c70e3f24a97b82f5ce9ad890fa95369e425a31ac.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revert "Compile fix for MSVC"
Compile fix for MSVC
Improve QAccessible for QAccessibleTabBar
Improve QAccessible for QTabBar
fix the export macros for the QtDBus module
rebuild configure.exe
make "configure -qt-gif" work again on Windows
Fix a typo in harfbuzz thai line breaking.
Ensure that font sizes that are > 0 and < 1 are still respected
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qglobal.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 8a3166d..7b915cd 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1277,6 +1277,11 @@ class QDataStream; # else # define Q_COMPAT_EXPORT Q_DECL_IMPORT # endif +# if defined(QT_BUILD_DBUS_LIB) +# define Q_DBUS_EXPORT Q_DECL_EXPORT +# else +# define Q_DBUS_EXPORT Q_DECL_IMPORT +# endif # define Q_TEMPLATEDLL # elif defined(QT_DLL) /* use a Qt DLL library */ # define Q_CORE_EXPORT Q_DECL_IMPORT @@ -1294,6 +1299,7 @@ class QDataStream; # define Q_SCRIPT_EXPORT Q_DECL_IMPORT # define Q_SCRIPTTOOLS_EXPORT Q_DECL_IMPORT # define Q_COMPAT_EXPORT Q_DECL_IMPORT +# define Q_DBUS_EXPORT Q_DECL_IMPORT # define Q_TEMPLATEDLL # endif # define Q_NO_DECLARED_NOT_DEFINED @@ -1322,6 +1328,7 @@ class QDataStream; # define Q_SCRIPT_EXPORT Q_DECL_EXPORT # define Q_SCRIPTTOOLS_EXPORT Q_DECL_EXPORT # define Q_COMPAT_EXPORT Q_DECL_EXPORT +# define Q_DBUS_EXPORT Q_DECL_EXPORT # else # define Q_CORE_EXPORT # define Q_GUI_EXPORT @@ -1336,6 +1343,7 @@ class QDataStream; # define Q_SCRIPT_EXPORT # define Q_SCRIPTTOOLS_EXPORT # define Q_COMPAT_EXPORT +# define Q_DBUS_EXPORT # endif #endif |