diff options
| author | François Andriot <[email protected]> | 2019-12-07 17:40:56 +0100 |
|---|---|---|
| committer | Slávek Banko <[email protected]> | 2019-12-08 19:17:12 +0100 |
| commit | bb14fad70e2118dc24fe811b184ad06d5268ff4b (patch) | |
| tree | 2b09cd99213798e863ec916144029ea6e4b09b2c | |
| parent | 24c6954b0bbc47ca8a095030b7d1600e71b1a7b9 (diff) | |
| download | tdesvn-bb14fad70e2118dc24fe811b184ad06d5268ff4b.tar.gz tdesvn-bb14fad70e2118dc24fe811b184ad06d5268ff4b.zip | |
Disable built-in sqlite3 plugin for TQt SQL.
Signed-off-by: François Andriot <[email protected]>
Signed-off-by: Slávek Banko <[email protected]>
(cherry picked from commit 46106f77652748020d25e1fe28c54f50a8da84b0)
| -rw-r--r-- | src/svnqt/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | src/svnqt/cache/LogCache.cpp | 10 |
2 files changed, 3 insertions, 22 deletions
diff --git a/src/svnqt/CMakeLists.txt b/src/svnqt/CMakeLists.txt index edca903..73d61cf 100644 --- a/src/svnqt/CMakeLists.txt +++ b/src/svnqt/CMakeLists.txt @@ -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) diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp index d1f5aaa..a3cb590 100644 --- a/src/svnqt/cache/LogCache.cpp +++ b/src/svnqt/cache/LogCache.cpp @@ -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.")); |