Disable built-in sqlite3 plugin for TQt SQL.

Signed-off-by: François Andriot <francois.andriot@free.fr>
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
pull/5/head
François Andriot 5 years ago committed by Slávek Banko
parent 89abb627e2
commit 46106f7765
No known key found for this signature in database
GPG Key ID: 608F5293A04BE668

@ -45,19 +45,6 @@ SET(SOURCES
cache/DatabaseException.cpp
)
# IF (SQLITE_FOUND)
MESSAGE(STATUS "Build own sqlite3 database modul")
SET(SOURCES
${SOURCES}
cache/sqlite3/qsqlcachedresult.cpp
cache/sqlite3/qsql_sqlite3.cpp
cache/sqlite3/qsqlcachedresult.h
cache/sqlite3/qsql_sqlite3.h
)
# ELSE (SQLITE_FOUND)
# MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found")
# ENDIF (SQLITE_FOUND)
SET(CACHEINST_HEADERS
cache/LogCache.hpp
cache/ReposLog.hpp
@ -150,7 +137,7 @@ TARGET_LINK_LIBRARIES(${svnqt-name} ${TQT_LIBRARIES} ${SUBVERSION_ALL_LIBS} ${AL
# IF (SQLITE_FOUND)
TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR)
INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR})
# ELSE (SQLITE_FOUND)
# TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
# ENDIF (SQLITE_FOUND)

@ -10,10 +10,9 @@
#include "svnqt/cache/DatabaseException.hpp"
#ifndef NO_SQLITE3
#include "sqlite3/qsql_sqlite3.h"
#define SQLTYPE "QSQLITE3"
#define SQLTYPE "TQSQLITE3"
#else
#define SQLTYPE "QSQLITE"
#define SQLTYPE "TQSQLITE"
#endif
#define SQLMAIN "logmain-logcache"
@ -262,11 +261,6 @@ void LogCache::setupCachePath()
void LogCache::setupMainDb()
{
#ifndef NO_SQLITE3
if (!TQSqlDatabase::isDriverAvailable(SQLTYPE)) {
TQSqlDatabase::registerSqlDriver(SQLTYPE,new TQSqlDriverCreator<TQSQLite3Driver>);
}
#endif
TQDataBase mainDB = m_CacheData->getMainDB();
if (!mainDB || !mainDB->open()) {
tqWarning("Failed to open main database: %s", (mainDB?mainDB->lastError().text().TOUTF8().data():"No database object."));

Loading…
Cancel
Save