summaryrefslogtreecommitdiffstats
path: root/abs/core/qt3/mysql.patch
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2012-08-07 18:24:03 (GMT)
committerJames Meyer <james.meyer@operamail.com>2012-08-07 18:24:03 (GMT)
commit8cff87efa971141bf4670a7621b08975e6800945 (patch)
tree3c1c31c00427a3a24deb1605ad2c8b0a2d76b100 /abs/core/qt3/mysql.patch
parentc9c7d42b1b791d4056b4fc9b4b649e14983bb0db (diff)
downloadlinhes_pkgbuild-8cff87efa971141bf4670a7621b08975e6800945.zip
linhes_pkgbuild-8cff87efa971141bf4670a7621b08975e6800945.tar.gz
linhes_pkgbuild-8cff87efa971141bf4670a7621b08975e6800945.tar.bz2
qt3
Diffstat (limited to 'abs/core/qt3/mysql.patch')
-rw-r--r--abs/core/qt3/mysql.patch47
1 files changed, 0 insertions, 47 deletions
diff --git a/abs/core/qt3/mysql.patch b/abs/core/qt3/mysql.patch
deleted file mode 100644
index 5f61edc..0000000
--- a/abs/core/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