diff options
author | Parabola <dev@list.parabolagnulinux.org> | 2012-02-15 20:35:57 +0000 |
---|---|---|
committer | Parabola <dev@list.parabolagnulinux.org> | 2012-02-15 20:35:57 +0000 |
commit | 1ffabe284d9f5a4ac055941d9817af71be1e5b54 (patch) | |
tree | 2b816cb3cc40a5f3053c8371de5613041272e298 /testing/qt3/mysql.patch | |
parent | 650a87f5a67f6e71d4a56e52139a718d86ebbb46 (diff) |
Wed Feb 15 20:35:56 UTC 2012
Diffstat (limited to 'testing/qt3/mysql.patch')
-rw-r--r-- | testing/qt3/mysql.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/testing/qt3/mysql.patch b/testing/qt3/mysql.patch deleted file mode 100644 index 5f61edc67..000000000 --- a/testing/qt3/mysql.patch +++ /dev/null @@ -1,47 +0,0 @@ ---- 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 |