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/drivers/psql/qsql_psql.h | |
| 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/drivers/psql/qsql_psql.h')
| -rw-r--r-- | src/sql/drivers/psql/qsql_psql.h | 5 |
1 files changed, 5 insertions, 0 deletions
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; |