From 329fb608774ca3e6a9bc273683fd4509f3629cd4 Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 1 Nov 2018 22:37:59 +0900 Subject: Fixed FTBFS caused by name conflict with new postgres server dev 11 package. Signed-off-by: Michele Calgaro (cherry picked from commit 4a5da4685a8607a87602e065d1e3abdbf66c9ff9) --- src/sql/qsqlextension_p.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sql/qsqlextension_p.cpp') 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 QSqlExtension::boundValues() const { - QMap::ConstIterator it; + QMap::ConstIterator it; QMap m; if ( bindm == BindByName ) { for ( it = values.begin(); it != values.end(); ++it ) -- cgit v1.2.3