diff options
| author | Parabola <dev@list.parabolagnulinux.org> | 2012-01-09 13:47:51 +0000 |
|---|---|---|
| committer | Parabola <dev@list.parabolagnulinux.org> | 2012-01-09 13:47:51 +0000 |
| commit | 7a3611f5caa5e34c1f2b582640f97b733110ae63 (patch) | |
| tree | 5b0baf1ad1b36444ffbf73707a377b15fc67692f /staging/qt3/mysql.patch | |
| parent | 46783b68621b6ad45cdd9ed64cfa8cdcfbc6f318 (diff) | |
Mon Jan 9 13:47:49 UTC 2012
Diffstat (limited to 'staging/qt3/mysql.patch')
| -rw-r--r-- | staging/qt3/mysql.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/staging/qt3/mysql.patch b/staging/qt3/mysql.patch deleted file mode 100644 index 5f61edc67..000000000 --- a/staging/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 |