whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
bb10
Mark Brand 2015-11-19 13:06:01 +01:00
parent f00794bb12
commit 6333edfdf3
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sql/drivers/ibase/qsql_ibase_p.h
View File

@ -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)

2
src/sql/drivers/oci/qsql_oci.cpp
View File

@ -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;

8
src/sql/drivers/sqlite2/qsql_sqlite2_p.h
View File

@ -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)