From fa95a0d0b1ad15fd771884935fd20c3e302e34d7 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Sun, 16 Nov 2014 18:37:46 +0100 Subject: [PATCH] Look into the list of driver instead of probing. This eliminates a Qt warning about a not available QSql backend. --- src/libtomahawk/database/DatabaseImpl.cpp | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/libtomahawk/database/DatabaseImpl.cpp b/src/libtomahawk/database/DatabaseImpl.cpp index 7bc09928f..63d3363bc 100644 --- a/src/libtomahawk/database/DatabaseImpl.cpp +++ b/src/libtomahawk/database/DatabaseImpl.cpp @@ -739,10 +739,15 @@ Tomahawk::DatabaseImpl::openDatabase( const QString& dbname, bool checkSchema ) { if ( sqlDriver.isEmpty() ) { - sqlDriver = QString( "QSQLITE3" ); - QSqlDatabase testdb = QSqlDatabase::addDatabase( sqlDriver, "testDriverConnection" ); - if ( !testdb.isValid() ) - sqlDriver = QString( "QSQLITE" ); + QStringList drivers = QSqlDatabase::drivers(); + if (drivers.contains( "QSQLITE3" )) + { + sqlDriver = "QSQLITE3"; + } + else + { + sqlDriver = "QSQLITE"; + } } QSqlDatabase db = QSqlDatabase::addDatabase( sqlDriver, connName );