1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-06 14:16:32 +02:00

Merge pull request #277 from tomahawk-player/fix-qsqldatabase-warning

Look into the list of driver instead of probing.
This commit is contained in:
Christian Muehlhaeuser
2014-11-17 05:57:17 +01:00

View File

@@ -739,10 +739,15 @@ Tomahawk::DatabaseImpl::openDatabase( const QString& dbname, bool checkSchema )
{ {
if ( sqlDriver.isEmpty() ) if ( sqlDriver.isEmpty() )
{ {
sqlDriver = QString( "QSQLITE3" ); QStringList drivers = QSqlDatabase::drivers();
QSqlDatabase testdb = QSqlDatabase::addDatabase( sqlDriver, "testDriverConnection" ); if (drivers.contains( "QSQLITE3" ))
if ( !testdb.isValid() ) {
sqlDriver = QString( "QSQLITE" ); sqlDriver = "QSQLITE3";
}
else
{
sqlDriver = "QSQLITE";
}
} }
QSqlDatabase db = QSqlDatabase::addDatabase( sqlDriver, connName ); QSqlDatabase db = QSqlDatabase::addDatabase( sqlDriver, connName );