diff options
author | Michele Calgaro <[email protected]> | 2018-11-01 22:37:59 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2018-11-01 22:38:51 +0900 |
commit | 329fb608774ca3e6a9bc273683fd4509f3629cd4 (patch) | |
tree | b15733a115f86d1a8018c1a2f9561c77b02c7a30 /src/sql/qsqlextension_p.cpp | |
parent | 305c060e4e41bd881a1b0bce70a66e53fbff9758 (diff) | |
download | qt3-329fb608774ca3e6a9bc273683fd4509f3629cd4.tar.gz qt3-329fb608774ca3e6a9bc273683fd4509f3629cd4.zip |
Fixed FTBFS caused by name conflict with new postgres server dev 11
package.
Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit 4a5da4685a8607a87602e065d1e3abdbf66c9ff9)
Diffstat (limited to 'src/sql/qsqlextension_p.cpp')
-rw-r--r-- | src/sql/qsqlextension_p.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/sql/qsqlextension_p.cpp b/src/sql/qsqlextension_p.cpp index 4e68fee..137ef50 100644 --- a/src/sql/qsqlextension_p.cpp +++ b/src/sql/qsqlextension_p.cpp @@ -68,7 +68,7 @@ void QSqlExtension::bindValue( const QString& placeholder, const QVariant& val, if ( index.contains( (int)values.count() ) ) { index[ (int)values.count() ] = placeholder; } - values[ placeholder ] = Param( val, tp ); + values[ placeholder ] = QtParam( val, tp ); } void QSqlExtension::bindValue( int pos, const QVariant& val, QSql::ParameterType tp ) @@ -76,7 +76,7 @@ void QSqlExtension::bindValue( int pos, const QVariant& val, QSql::ParameterType bindm = BindByPosition; index[ pos ] = QString::number( pos ); QString nm = QString::number( pos ); - values[ nm ] = Param( val, tp ); + values[ nm ] = QtParam( val, tp ); } void QSqlExtension::addBindValue( const QVariant& val, QSql::ParameterType tp ) @@ -130,7 +130,7 @@ QVariant QSqlExtension::boundValue( int pos ) const QMap<QString, QVariant> QSqlExtension::boundValues() const { - QMap<QString, Param>::ConstIterator it; + QMap<QString, QtParam>::ConstIterator it; QMap<QString, QVariant> m; if ( bindm == BindByName ) { for ( it = values.begin(); it != values.end(); ++it ) |