TDE
/
qt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/qt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Fixed FTBFS caused by name conflict with new postgres server dev 11

Browse Source 
package.

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit 4a5da4685a)
r14.0.x
Michele Calgaro 6 years ago
parent 305c060e4e
commit 329fb60877
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

6
src/sql/qsqlextension_p.cpp
Unescape View File

@ -68,7 +68,7 @@ void QSqlExtension::bindValue( const QString& placeholder, const QVariant& val,
if ( index.contains( (int)values.count() ) ) { if ( index.contains( (int)values.count() ) ) {
index[ (int)values.count() ] = placeholder; 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 ) 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; bindm = BindByPosition;
index[ pos ] = QString::number( pos ); index[ pos ] = QString::number( pos );
QString nm = 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 ) 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, QVariant> QSqlExtension::boundValues() const
{ {
QMap<QString, Param>::ConstIterator it; QMap<QString, QtParam>::ConstIterator it;
QMap<QString, QVariant> m; QMap<QString, QVariant> m;
if ( bindm == BindByName ) { if ( bindm == BindByName ) {
for ( it = values.begin(); it != values.end(); ++it ) for ( it = values.begin(); it != values.end(); ++it )

8
src/sql/qsqlextension_p.h
Unescape View File

@ -71,11 +71,11 @@
#define QM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN #define QM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN
#endif #endif
struct Param { struct QtParam {
Param( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {} QtParam( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {}
QVariant value; QVariant value;
QSql::ParameterType typ; QSql::ParameterType typ;
Q_DUMMY_COMPARISON_OPERATOR(Param) Q_DUMMY_COMPARISON_OPERATOR(QtParam)
}; };
struct Holder { struct Holder {
@ -114,7 +114,7 @@ public:
int bindCount; int bindCount;
QMap<int, QString> index; QMap<int, QString> index;
typedef QMap<QString, Param> ValueMap; typedef QMap<QString, QtParam> ValueMap;
ValueMap values; ValueMap values;
// convenience container for QSqlQuery // convenience container for QSqlQuery

2
src/tools/qwinexport.h
Unescape View File

@ -215,7 +215,7 @@ QM_TEMPLATE_EXTERN_TABLE template class QM_EXPORT_TABLE QPtrVector<QTableItem>;
// qsqlextension template exports // qsqlextension template exports
#if defined(Q_DEFINED_QSQLEXTENSION) && defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QVALUEVECTOR) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QSQLEXTENSION_TEMPLATES) #if defined(Q_DEFINED_QSQLEXTENSION) && defined(Q_DEFINED_QMAP) && defined(Q_DEFINED_QVALUEVECTOR) && defined(Q_DEFINED_QSTRING) && !defined(Q_EXPORTED_QSQLEXTENSION_TEMPLATES)
#define Q_EXPORTED_QSQLEXTENSION_TEMPLATES #define Q_EXPORTED_QSQLEXTENSION_TEMPLATES
QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QMap<QString,Param>; QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QMap<QString,QtParam>;
QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QValueVector<Holder>; QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QValueVector<Holder>;
#endif #endif

Write Preview
Loading…
Cancel
Save