diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-11-01 22:37:59 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-11-01 22:37:59 +0900 |
| commit | 4a5da4685a8607a87602e065d1e3abdbf66c9ff9 (patch) | |
| tree | 287c72141034c052bfd51c9ecc78e7fa5277f553 /src/sql/qsqlextension_p.h | |
| parent | 0614be092185ccde33cd70fe6076f19970ebe571 (diff) | |
| download | qt3-4a5da4685a8607a87602e065d1e3abdbf66c9ff9.tar.gz qt3-4a5da4685a8607a87602e065d1e3abdbf66c9ff9.zip | |
Fixed FTBFS caused by name conflict with new postgres server dev 11
package.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
Diffstat (limited to 'src/sql/qsqlextension_p.h')
| -rw-r--r-- | src/sql/qsqlextension_p.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/sql/qsqlextension_p.h b/src/sql/qsqlextension_p.h index 01e540e..a77be75 100644 --- a/src/sql/qsqlextension_p.h +++ b/src/sql/qsqlextension_p.h @@ -71,11 +71,11 @@ #define QM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN #endif -struct Param { - Param( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {} +struct QtParam { + QtParam( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {} QVariant value; QSql::ParameterType typ; - Q_DUMMY_COMPARISON_OPERATOR(Param) + Q_DUMMY_COMPARISON_OPERATOR(QtParam) }; struct Holder { @@ -114,7 +114,7 @@ public: int bindCount; QMap<int, QString> index; - typedef QMap<QString, Param> ValueMap; + typedef QMap<QString, QtParam> ValueMap; ValueMap values; // convenience container for QSqlQuery |