diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-22 11:03:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 23:34:56 +0200 |
| commit | 239a3eabf1de439d9c56bb8891479248de5a7153 (patch) | |
| tree | faee121da4ca3013063ccb5464e19eeb0f231b30 | |
| parent | e59230d30f14857a70ed886ef6f2fcf5c88849fa (diff) | |
Update the export macros in qtjsondb.git
Use the new, simpler QT_STATIC macro.
Change-Id: Ic7fd86c76c10ebfd27cf3d4629373844dff7c52b
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
| -rw-r--r-- | src/client/qjsondbglobal.h | 8 | ||||
| -rw-r--r-- | src/clientcompat/jsondb-global.h | 8 | ||||
| -rw-r--r-- | src/partition/jsondbpartitionglobal.h | 8 |
3 files changed, 18 insertions, 6 deletions
diff --git a/src/client/qjsondbglobal.h b/src/client/qjsondbglobal.h index 2d18d519..038d952b 100644 --- a/src/client/qjsondbglobal.h +++ b/src/client/qjsondbglobal.h @@ -44,10 +44,14 @@ #include "QtCore/qglobal.h" -#if defined(QT_BUILD_JSONDB_LIB) +#ifndef QT_STATIC +# if defined(QT_BUILD_JSONDB_LIB) # define Q_JSONDB_EXPORT Q_DECL_EXPORT -#else +# else # define Q_JSONDB_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_JSONDB_EXPORT #endif #if defined(QT_NAMESPACE) diff --git a/src/clientcompat/jsondb-global.h b/src/clientcompat/jsondb-global.h index 7a13adcb..a9a5d870 100644 --- a/src/clientcompat/jsondb-global.h +++ b/src/clientcompat/jsondb-global.h @@ -43,10 +43,14 @@ #include "qglobal.h" -#if defined(QT_BUILD_JSONDBCOMPAT_LIB) +#ifndef QT_STATIC +# if defined(QT_BUILD_JSONDBCOMPAT_LIB) # define Q_ADDON_JSONDB_EXPORT Q_DECL_EXPORT -#else +# else # define Q_ADDON_JSONDB_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_ADDON_JSONDB_EXPORT #endif #if defined(QT_NAMESPACE) diff --git a/src/partition/jsondbpartitionglobal.h b/src/partition/jsondbpartitionglobal.h index c66e40c2..2bcd6ffb 100644 --- a/src/partition/jsondbpartitionglobal.h +++ b/src/partition/jsondbpartitionglobal.h @@ -44,10 +44,14 @@ #include "QtCore/qglobal.h" -#if defined(QT_BUILD_JSONDBPARTITION_LIB) +#ifndef QT_STATIC +# if defined(QT_BUILD_JSONDBPARTITION_LIB) # define Q_JSONDB_PARTITION_EXPORT Q_DECL_EXPORT -#else +# else # define Q_JSONDB_PARTITION_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_JSONDB_PARTITION_EXPORT #endif #if defined(QT_NAMESPACE) |