diff options
| author | James Meyer <James.meyer@operamail.com> | 2008-10-02 03:19:12 (GMT) |
|---|---|---|
| committer | James Meyer <James.meyer@operamail.com> | 2008-10-02 03:19:12 (GMT) |
| commit | 0e2532d4e8f4eed5e047f1db54d5c03ba849ec0a (patch) | |
| tree | c0aa2c0b53c317be87eacfcb77b63f53f1f415e7 /abs/core-testing/qt3/mysql.patch | |
| download | linhes_pkgbuild-0e2532d4e8f4eed5e047f1db54d5c03ba849ec0a.zip linhes_pkgbuild-0e2532d4e8f4eed5e047f1db54d5c03ba849ec0a.tar.gz linhes_pkgbuild-0e2532d4e8f4eed5e047f1db54d5c03ba849ec0a.tar.bz2 | |
initial import
Diffstat (limited to 'abs/core-testing/qt3/mysql.patch')
| -rw-r--r-- | abs/core-testing/qt3/mysql.patch | 47 |
1 files changed, 47 insertions, 0 deletions
diff --git a/abs/core-testing/qt3/mysql.patch b/abs/core-testing/qt3/mysql.patch new file mode 100644 index 0000000..5f61edc --- /dev/null +++ b/abs/core-testing/qt3/mysql.patch @@ -0,0 +1,47 @@ +--- src/sql/drivers/mysql/qsql_mysql.cpp ++++ src/sql/drivers/mysql/qsql_mysql.cpp +@@ -37,7 +37,6 @@ + #include "qsql_mysql.h" + #include <private/qsqlextension_p.h> + +-#include <qapplication.h> + #include <qdatetime.h> + #include <qvaluevector.h> + #include <qsqlrecord.h> +@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected() + } + + ///////////////////////////////////////////////////////// +-static void qServerEnd() +-{ +-#ifndef Q_NO_MYSQL_EMBEDDED +-# if MYSQL_VERSION_ID >= 40000 +- mysql_server_end(); +-# endif // MYSQL_VERSION_ID +-#endif // Q_NO_MYSQL_EMBEDDED +-} + + static void qServerInit() + { +@@ -366,9 +357,7 @@ static void qServerInit() + qWarning( "QMYSQLDriver::qServerInit: unable to start server." ); + # endif + } +- qAddPostRoutine(qServerEnd); + init = TRUE; +- + # endif // MYSQL_VERSION_ID + #endif // Q_NO_MYSQL_EMBEDDED + } +@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver() + QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this ); + delete ext; + } ++#ifndef Q_NO_MYSQL_EMBEDDED ++# if MYSQL_VERSION_ID > 40000 ++ mysql_server_end(); ++# endif ++#endif + } + + bool QMYSQLDriver::hasFeature( DriverFeature f ) const |