diff --git a/qt-x11-free-3.3.8b-#1037297.patch b/qt-x11-free-3.3.8b-#1037297.patch index eb1ea30..6f9d6e8 100644 --- a/qt-x11-free-3.3.8b-#1037297.patch +++ b/qt-x11-free-3.3.8b-#1037297.patch @@ -71,6 +71,44 @@ diff -ur qt-x11-free-3.3.8b/src/moc/moc_yacc.cpp qt-x11-free-3.3.8b-#1037297/src if ( !g->noInclude ) { /* +diff -ur qt-x11-free-3.3.8b/src/sql/drivers/odbc/qsql_odbc.cpp qt-x11-free-3.3.8b-#1037297/src/sql/drivers/odbc/qsql_odbc.cpp +--- qt-x11-free-3.3.8b/src/sql/drivers/odbc/qsql_odbc.cpp 2008-01-15 20:09:13.000000000 +0100 ++++ qt-x11-free-3.3.8b-#1037297/src/sql/drivers/odbc/qsql_odbc.cpp 2014-01-14 04:24:04.000000000 +0100 +@@ -540,7 +540,7 @@ + } else if ( val == "SQL_MODE_READ_WRITE" ) { + v = SQL_MODE_READ_WRITE; + } else { +- qWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) ); ++ qWarning( "%s", QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ).ascii() ); + break; + } + r = SQLSetConnectAttr( hDbc, SQL_ATTR_ACCESS_MODE, (SQLPOINTER) v, 0 ); +@@ -565,7 +565,7 @@ + } else if ( val == "SQL_FALSE" ) { + v = SQL_FALSE; + } else { +- qWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) ); ++ qWarning( "%s", QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ).ascii() ); + break; + } + r = SQLSetConnectAttr( hDbc, SQL_ATTR_METADATA_ID, (SQLPOINTER) v, 0 ); +@@ -587,14 +587,14 @@ + } else if ( val == "SQL_OPT_TRACE_ON" ) { + v = SQL_OPT_TRACE_ON; + } else { +- qWarning( QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ) ); ++ qWarning( "%s", QString( "QODBCDriver::open: Unknown option value '%1'" ).arg( *it ).ascii() ); + break; + } + r = SQLSetConnectAttr( hDbc, SQL_ATTR_TRACE, (SQLPOINTER) v, 0 ); + } + #ifdef QT_CHECK_RANGE + else { +- qWarning( QString("QODBCDriver::open: Unknown connection attribute '%1'").arg( opt ) ); ++ qWarning( "%s", QString("QODBCDriver::open: Unknown connection attribute '%1'").arg( opt ).ascii() ); + } + #endif + if ( r != SQL_SUCCESS && r != SQL_SUCCESS_WITH_INFO ) { diff -ur qt-x11-free-3.3.8b/src/tools/qgcache.cpp qt-x11-free-3.3.8b-#1037297/src/tools/qgcache.cpp --- qt-x11-free-3.3.8b/src/tools/qgcache.cpp 2008-01-15 20:09:13.000000000 +0100 +++ qt-x11-free-3.3.8b-#1037297/src/tools/qgcache.cpp 2014-01-14 03:10:08.000000000 +0100