diff options
Diffstat (limited to 'src/plugins/sqldrivers/mysql')
-rw-r--r-- | src/plugins/sqldrivers/mysql/CMakeLists.txt | 24 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/main.cpp | 1 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/mysql.json | 2 | ||||
-rw-r--r-- | src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 2 |
4 files changed, 26 insertions, 3 deletions
diff --git a/src/plugins/sqldrivers/mysql/CMakeLists.txt b/src/plugins/sqldrivers/mysql/CMakeLists.txt new file mode 100644 index 0000000000..c99f322dfb --- /dev/null +++ b/src/plugins/sqldrivers/mysql/CMakeLists.txt @@ -0,0 +1,24 @@ +# Generated from mysql.pro. + +##################################################################### +## QMYSQLDriverPlugin Plugin: +##################################################################### + +qt_add_plugin(QMYSQLDriverPlugin + OUTPUT_NAME qsqlmysql + TYPE sqldrivers + SOURCES + main.cpp + qsql_mysql.cpp qsql_mysql_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + QT_NO_CAST_TO_ASCII + PUBLIC_LIBRARIES + MySQL::MySQL + Qt::Core + Qt::CorePrivate + Qt::SqlPrivate +) + +#### Keys ignored in scope 1:.:.:mysql.pro:<TRUE>: +# OTHER_FILES = "mysql.json" diff --git a/src/plugins/sqldrivers/mysql/main.cpp b/src/plugins/sqldrivers/mysql/main.cpp index 4c6753097f..f7d56dd1c9 100644 --- a/src/plugins/sqldrivers/mysql/main.cpp +++ b/src/plugins/sqldrivers/mysql/main.cpp @@ -62,7 +62,6 @@ QMYSQLDriverPlugin::QMYSQLDriverPlugin() QSqlDriver* QMYSQLDriverPlugin::create(const QString &name) { if (name == QLatin1String("QMYSQL") || - name == QLatin1String("QMYSQL3") || name == QLatin1String("QMARIADB")) { QMYSQLDriver* driver = new QMYSQLDriver(); return driver; diff --git a/src/plugins/sqldrivers/mysql/mysql.json b/src/plugins/sqldrivers/mysql/mysql.json index 89f5e65fb9..8fd3d727b1 100644 --- a/src/plugins/sqldrivers/mysql/mysql.json +++ b/src/plugins/sqldrivers/mysql/mysql.json @@ -1,3 +1,3 @@ { - "Keys": [ "QMYSQL3", "QMYSQL", "QMARIADB" ] + "Keys": [ "QMYSQL", "QMARIADB" ] } diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index d3e37f11d6..4e2698760f 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -322,7 +322,7 @@ static QSqlError qMakeStmtError(const QString& err, QSqlError::ErrorType type, MYSQL_STMT* stmt) { const char *cerr = mysql_stmt_error(stmt); - return QSqlError(QLatin1String("QMYSQL3: ") + err, + return QSqlError(QLatin1String("QMYSQL: ") + err, QString::fromLatin1(cerr), type, QString::number(mysql_stmt_errno(stmt))); } |