diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2015-11-19 13:06:01 +0100 |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2015-11-27 12:15:05 +0000 |
| commit | 6333edfdf3a682dfa8f54fe021f9aa55d6c91049 (patch) | |
| tree | 690c2a3b63a1fca9fea216f9572d5302f8492d45 | |
| parent | f00794bb12a26c79135eb45656e994542ce81c99 (diff) | |
qsql: add missing Q_EXPORT_SQLDRIVER_* macros
and remove a stray one.
Change-Id: I1a10688e6cf916aa93f383ecc9e9aa8e28966e95
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
Reviewed-by: Andre Somers <andre@familiesomers.nl>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
| -rw-r--r-- | src/sql/drivers/ibase/qsql_ibase_p.h | 8 | ||||
| -rw-r--r-- | src/sql/drivers/oci/qsql_oci.cpp | 2 | ||||
| -rw-r--r-- | src/sql/drivers/sqlite2/qsql_sqlite2_p.h | 8 |
3 files changed, 15 insertions, 3 deletions
diff --git a/src/sql/drivers/ibase/qsql_ibase_p.h b/src/sql/drivers/ibase/qsql_ibase_p.h index 82a8c205dc..4ca48f818d 100644 --- a/src/sql/drivers/ibase/qsql_ibase_p.h +++ b/src/sql/drivers/ibase/qsql_ibase_p.h @@ -48,12 +48,18 @@ #include <QtSql/qsqldriver.h> #include <ibase.h> +#ifdef QT_PLUGIN +#define Q_EXPORT_SQLDRIVER_IBASE +#else +#define Q_EXPORT_SQLDRIVER_IBASE Q_SQL_EXPORT +#endif + QT_BEGIN_NAMESPACE class QSqlResult; class QIBaseDriverPrivate; -class QIBaseDriver : public QSqlDriver +class Q_EXPORT_SQLDRIVER_IBASE QIBaseDriver : public QSqlDriver { friend class QIBaseResultPrivate; Q_DECLARE_PRIVATE(QIBaseDriver) diff --git a/src/sql/drivers/oci/qsql_oci.cpp b/src/sql/drivers/oci/qsql_oci.cpp index 6042eb5c09..4179e6caa3 100644 --- a/src/sql/drivers/oci/qsql_oci.cpp +++ b/src/sql/drivers/oci/qsql_oci.cpp @@ -158,7 +158,7 @@ QT_END_INCLUDE_NAMESPACE class QOCICols; struct QOCIResultPrivate; -class Q_EXPORT_SQLDRIVER_OCI QOCIResult : public QSqlCachedResult +class QOCIResult: public QSqlCachedResult { friend class QOCIDriver; friend struct QOCIResultPrivate; diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2_p.h b/src/sql/drivers/sqlite2/qsql_sqlite2_p.h index 662d042166..8b6128728c 100644 --- a/src/sql/drivers/sqlite2/qsql_sqlite2_p.h +++ b/src/sql/drivers/sqlite2/qsql_sqlite2_p.h @@ -53,12 +53,18 @@ struct sqlite; +#ifdef QT_PLUGIN +#define Q_EXPORT_SQLDRIVER_SQLITE2 +#else +#define Q_EXPORT_SQLDRIVER_SQLITE2 Q_SQL_EXPORT +#endif + QT_BEGIN_NAMESPACE class QSqlResult; class QSQLite2DriverPrivate; -class QSQLite2Driver : public QSqlDriver +class Q_EXPORT_SQLDRIVER_SQLITE2 QSQLite2Driver : public QSqlDriver { friend class QSQLite2Result; Q_DECLARE_PRIVATE(QSQLite2Driver) |