diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-16 01:22:45 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-16 01:22:45 +0100 |
commit | 7075e291998612a3c0a530bb37a515dd07739e28 (patch) | |
tree | 4e1992498d82ee3f6f92fd6d42754c92928dd581 /src/sql | |
parent | 1161a8a62907796ea45b1877bec31e66aeef77f6 (diff) | |
parent | 3d9a40038f01bc2a3df0027a9be04e7fa3ce3850 (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/widgets/styles/qstyleanimation.cpp
Change-Id: Iae570895be6544de80f9c1ec309d1a08c59daff8
Diffstat (limited to 'src/sql')
-rw-r--r-- | src/sql/drivers/db2/qsql_db2.h | 6 | ||||
-rw-r--r-- | src/sql/drivers/ibase/qsql_ibase.h | 6 | ||||
-rw-r--r-- | src/sql/drivers/mysql/qsql_mysql.h | 5 | ||||
-rw-r--r-- | src/sql/drivers/oci/qsql_oci.h | 5 | ||||
-rw-r--r-- | src/sql/drivers/odbc/qsql_odbc.h | 5 | ||||
-rw-r--r-- | src/sql/drivers/psql/qsql_psql.h | 5 | ||||
-rw-r--r-- | src/sql/drivers/sqlite/qsql_sqlite.h | 6 | ||||
-rw-r--r-- | src/sql/drivers/sqlite2/qsql_sqlite2.h | 5 | ||||
-rw-r--r-- | src/sql/drivers/tds/qsql_tds.h | 5 |
9 files changed, 48 insertions, 0 deletions
diff --git a/src/sql/drivers/db2/qsql_db2.h b/src/sql/drivers/db2/qsql_db2.h index 99d2e5d505..35dbd4af04 100644 --- a/src/sql/drivers/db2/qsql_db2.h +++ b/src/sql/drivers/db2/qsql_db2.h @@ -54,6 +54,12 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE + +#if 0 +#pragma qt_no_master_include +#pragma qt_sync_stop_processing +#endif + class QDB2Driver; class QDB2DriverPrivate; class QDB2ResultPrivate; diff --git a/src/sql/drivers/ibase/qsql_ibase.h b/src/sql/drivers/ibase/qsql_ibase.h index 86c5365823..de86744731 100644 --- a/src/sql/drivers/ibase/qsql_ibase.h +++ b/src/sql/drivers/ibase/qsql_ibase.h @@ -50,6 +50,12 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE + +#if 0 +#pragma qt_no_master_include +#pragma qt_sync_stop_processing +#endif + class QIBaseDriverPrivate; class QIBaseResultPrivate; class QIBaseDriver; diff --git a/src/sql/drivers/mysql/qsql_mysql.h b/src/sql/drivers/mysql/qsql_mysql.h index d48218537b..eb17c8ed28 100644 --- a/src/sql/drivers/mysql/qsql_mysql.h +++ b/src/sql/drivers/mysql/qsql_mysql.h @@ -61,6 +61,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#if 0 +#pragma qt_no_master_include +#pragma qt_sync_stop_processing +#endif + class QMYSQLDriverPrivate; class QMYSQLResultPrivate; class QMYSQLDriver; diff --git a/src/sql/drivers/oci/qsql_oci.h b/src/sql/drivers/oci/qsql_oci.h index 15a0357ace..188dba2c64 100644 --- a/src/sql/drivers/oci/qsql_oci.h +++ b/src/sql/drivers/oci/qsql_oci.h @@ -59,6 +59,11 @@ typedef struct OCISvcCtx OCISvcCtx; QT_BEGIN_NAMESPACE +#if 0 +#pragma qt_no_master_include +#pragma qt_sync_stop_processing +#endif + class QOCIDriver; class QOCICols; struct QOCIDriverPrivate; diff --git a/src/sql/drivers/odbc/qsql_odbc.h b/src/sql/drivers/odbc/qsql_odbc.h index 18a3c68b57..4e60e90c11 100644 --- a/src/sql/drivers/odbc/qsql_odbc.h +++ b/src/sql/drivers/odbc/qsql_odbc.h @@ -74,6 +74,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#if 0 +#pragma qt_no_master_include +#pragma qt_sync_stop_processing +#endif + class QODBCPrivate; class QODBCDriverPrivate; class QODBCDriver; diff --git a/src/sql/drivers/psql/qsql_psql.h b/src/sql/drivers/psql/qsql_psql.h index 4a2ec12bf1..fd02b3563f 100644 --- a/src/sql/drivers/psql/qsql_psql.h +++ b/src/sql/drivers/psql/qsql_psql.h @@ -58,6 +58,11 @@ typedef struct pg_result PGresult; QT_BEGIN_NAMESPACE +#if 0 +#pragma qt_no_master_include +#pragma qt_sync_stop_processing +#endif + class QPSQLResultPrivate; class QPSQLDriverPrivate; class QPSQLDriver; diff --git a/src/sql/drivers/sqlite/qsql_sqlite.h b/src/sql/drivers/sqlite/qsql_sqlite.h index 1b09ff505d..0dfb1f6207 100644 --- a/src/sql/drivers/sqlite/qsql_sqlite.h +++ b/src/sql/drivers/sqlite/qsql_sqlite.h @@ -57,6 +57,12 @@ struct sqlite3; QT_BEGIN_HEADER QT_BEGIN_NAMESPACE + +#if 0 +#pragma qt_no_master_include +#pragma qt_sync_stop_processing +#endif + class QSQLiteDriverPrivate; class QSQLiteResultPrivate; class QSQLiteDriver; diff --git a/src/sql/drivers/sqlite2/qsql_sqlite2.h b/src/sql/drivers/sqlite2/qsql_sqlite2.h index 5e1501671e..9e832dc360 100644 --- a/src/sql/drivers/sqlite2/qsql_sqlite2.h +++ b/src/sql/drivers/sqlite2/qsql_sqlite2.h @@ -58,6 +58,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#if 0 +#pragma qt_no_master_include +#pragma qt_sync_stop_processing +#endif + class QSQLite2DriverPrivate; class QSQLite2ResultPrivate; class QSQLite2Driver; diff --git a/src/sql/drivers/tds/qsql_tds.h b/src/sql/drivers/tds/qsql_tds.h index 55df21b163..81f1c7b754 100644 --- a/src/sql/drivers/tds/qsql_tds.h +++ b/src/sql/drivers/tds/qsql_tds.h @@ -71,6 +71,11 @@ QT_BEGIN_HEADER QT_BEGIN_NAMESPACE +#if 0 +#pragma qt_no_master_include +#pragma qt_sync_stop_processing +#endif + class QTDSDriverPrivate; class QTDSResultPrivate; class QTDSDriver; |