diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-06-06 20:04:41 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-29 00:27:18 +0200 |
| commit | 2b904294a87b303d4f1df03f92dd2c259ff53f00 (patch) | |
| tree | 2a4acef7efcabe7d0d03eb978b61b1672880c8ad /src/sql | |
| parent | 92283176ac3ab537b589dd6530fc7849adf5cae4 (diff) | |
Clean up the EXPORT macros in qglobal.h.
QtPlatformSupport is a static library. It should never export
anything, so Q_PLATFORMSUPPORT_EXPORT is unnecessary.
QtSql, QtXml, QtDBus, QtOpenGL and QtPrintSupport now have the macros
on their own source trees. It's possible these modules might be
separated out from qtbase in the future. For QtDBus, the macros are
moving back to where they used to be. This also leaves qglobal.h only
creating the macros for QtCore, QtGui, QtWidgets and QtNetwork, the
core libraries.
Q_CANVAS_EXPORT, Q_OPENVG_EXPORT and Q_COMPAT_EXPORT aren't used
anywhere in the Qt sources, so simply delete them. And the
Q_QUICK1_EXPORT macro in the static section was wrong, so remove it
too.
Change-Id: I50bdf86e783338f814903b25979721f788a7becf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'src/sql')
| -rw-r--r-- | src/sql/kernel/qsql.h | 9 | ||||
| -rw-r--r-- | src/sql/kernel/qsqldriverplugin.h | 1 | ||||
| -rw-r--r-- | src/sql/kernel/qsqlerror.h | 1 | ||||
| -rw-r--r-- | src/sql/kernel/qsqlfield.h | 1 | ||||
| -rw-r--r-- | src/sql/kernel/qsqlrecord.h | 1 |
5 files changed, 13 insertions, 0 deletions
diff --git a/src/sql/kernel/qsql.h b/src/sql/kernel/qsql.h index e8f4d9eab1..2f3ce946a3 100644 --- a/src/sql/kernel/qsql.h +++ b/src/sql/kernel/qsql.h @@ -48,6 +48,15 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#ifndef QT_STATIC +# if defined(QT_BUILD_SQL_LIB) +# define Q_SQL_EXPORT Q_DECL_EXPORT +# else +# define Q_SQL_EXPORT Q_DECL_IMPORT +# endif +#else +# define Q_SQL_EXPORT +#endif namespace QSql { diff --git a/src/sql/kernel/qsqldriverplugin.h b/src/sql/kernel/qsqldriverplugin.h index 4af9c8f73f..3e94b4c967 100644 --- a/src/sql/kernel/qsqldriverplugin.h +++ b/src/sql/kernel/qsqldriverplugin.h @@ -44,6 +44,7 @@ #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> +#include <QtSql/qsql.h> QT_BEGIN_HEADER diff --git a/src/sql/kernel/qsqlerror.h b/src/sql/kernel/qsqlerror.h index 528eb482af..5a9cb50af0 100644 --- a/src/sql/kernel/qsqlerror.h +++ b/src/sql/kernel/qsqlerror.h @@ -43,6 +43,7 @@ #define QSQLERROR_H #include <QtCore/qstring.h> +#include <QtSql/qsql.h> QT_BEGIN_HEADER diff --git a/src/sql/kernel/qsqlfield.h b/src/sql/kernel/qsqlfield.h index f5cda7ea64..d5d6662b66 100644 --- a/src/sql/kernel/qsqlfield.h +++ b/src/sql/kernel/qsqlfield.h @@ -44,6 +44,7 @@ #include <QtCore/qvariant.h> #include <QtCore/qstring.h> +#include <QtSql/qsql.h> QT_BEGIN_HEADER diff --git a/src/sql/kernel/qsqlrecord.h b/src/sql/kernel/qsqlrecord.h index 839c6ef898..ff05a22a1a 100644 --- a/src/sql/kernel/qsqlrecord.h +++ b/src/sql/kernel/qsqlrecord.h @@ -43,6 +43,7 @@ #define QSQLRECORD_H #include <QtCore/qstring.h> +#include <QtSql/qsql.h> QT_BEGIN_HEADER |