diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-04-16 16:47:38 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-27 21:28:22 +0200 |
| commit | c4765f686f08aed34d3adb2847c2dd3289958711 (patch) | |
| tree | 911319403d2b88ec0c597e547ccd1357abeed483 | |
| parent | 4ee9bf96fb4790d95bf95b59230034ec7911f453 (diff) | |
use auto-defined QT_BUILD_*_LIB variables
Change-Id: Iee5324ac523e603a25983b8a2581f07e44a5cdef
Reviewed-by: Denis Dzyubenko <denis.dzyubenko@nokia.com>
| -rw-r--r-- | src/client/client.pro | 1 | ||||
| -rw-r--r-- | src/client/qjsondbglobal.h | 2 | ||||
| -rw-r--r-- | src/clientcompat/clientcompat.pro | 1 | ||||
| -rw-r--r-- | src/clientcompat/jsondb-global.h | 2 | ||||
| -rw-r--r-- | src/partition/jsondbpartitionglobal.h | 2 | ||||
| -rw-r--r-- | src/partition/partition.pro | 1 |
6 files changed, 3 insertions, 6 deletions
diff --git a/src/client/client.pro b/src/client/client.pro index 32a46bf4..b4417d0d 100644 --- a/src/client/client.pro +++ b/src/client/client.pro @@ -7,7 +7,6 @@ load(qt_module_config) DESTDIR = $$QT.jsondb.libs VERSION = $$QT.jsondb.VERSION -DEFINES += QT_JSONDB_LIB QT = core network qml jsondbpartition diff --git a/src/client/qjsondbglobal.h b/src/client/qjsondbglobal.h index 5ca2217a..2d18d519 100644 --- a/src/client/qjsondbglobal.h +++ b/src/client/qjsondbglobal.h @@ -44,7 +44,7 @@ #include "QtCore/qglobal.h" -#if defined(QT_JSONDB_LIB) +#if defined(QT_BUILD_JSONDB_LIB) # define Q_JSONDB_EXPORT Q_DECL_EXPORT #else # define Q_JSONDB_EXPORT Q_DECL_IMPORT diff --git a/src/clientcompat/clientcompat.pro b/src/clientcompat/clientcompat.pro index 6ae0fcbb..c29273d2 100644 --- a/src/clientcompat/clientcompat.pro +++ b/src/clientcompat/clientcompat.pro @@ -7,7 +7,6 @@ load(qt_module_config) DESTDIR = $$QT.jsondbcompat.libs VERSION = $$QT.jsondbcompat.VERSION -DEFINES += QT_ADDON_JSONDB_LIB QT = core network diff --git a/src/clientcompat/jsondb-global.h b/src/clientcompat/jsondb-global.h index a85524bf..7a13adcb 100644 --- a/src/clientcompat/jsondb-global.h +++ b/src/clientcompat/jsondb-global.h @@ -43,7 +43,7 @@ #include "qglobal.h" -#if defined(QT_ADDON_JSONDB_LIB) +#if defined(QT_BUILD_JSONDBCOMPAT_LIB) # define Q_ADDON_JSONDB_EXPORT Q_DECL_EXPORT #else # define Q_ADDON_JSONDB_EXPORT Q_DECL_IMPORT diff --git a/src/partition/jsondbpartitionglobal.h b/src/partition/jsondbpartitionglobal.h index 9b88409b..c66e40c2 100644 --- a/src/partition/jsondbpartitionglobal.h +++ b/src/partition/jsondbpartitionglobal.h @@ -44,7 +44,7 @@ #include "QtCore/qglobal.h" -#if defined(QT_JSONDB_PARTITION_LIB) +#if defined(QT_BUILD_JSONDBPARTITION_LIB) # define Q_JSONDB_PARTITION_EXPORT Q_DECL_EXPORT #else # define Q_JSONDB_PARTITION_EXPORT Q_DECL_IMPORT diff --git a/src/partition/partition.pro b/src/partition/partition.pro index c20f3541..88bfd52a 100644 --- a/src/partition/partition.pro +++ b/src/partition/partition.pro @@ -7,7 +7,6 @@ load(qt_module_config) DESTDIR = $$QT.jsondbpartition.libs VERSION = $$QT.jsondbpartition.VERSION -DEFINES += QT_JSONDB_PARTITION_LIB QT = core network qml |