Attachment #2247 for bug #2117

By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release. View | Details | Raw Unified | Return to bug 2117
Collapse All | Expand All




    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


# IF (SQLITE_FOUND)
    TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
    INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR})
# ELSE (SQLITE_FOUND)
#     TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
# ENDIF (SQLITE_FOUND)




#include "svnqt/cache/DatabaseException.hpp"

#ifndef NO_SQLITE3
#include <qsql_sqlite3.h>
#define SQLTYPE "QSQLITE3"
#else
#include <qsql_sqlite.h>
#define SQLTYPE "QSQLITE"
#endif



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."));

Return to bug 2117

Lines 45-63 Link Here

(-)trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/CMakeLists.txt.sqlite3 (-14 / +1 lines)
45	cache/DatabaseException.cpp	45	cache/DatabaseException.cpp
46	)	46	)
47		47
48	# IF (SQLITE_FOUND)
49	MESSAGE(STATUS "Build own sqlite3 database modul")
50	SET(SOURCES
51	${SOURCES}
52	cache/sqlite3/qsqlcachedresult.cpp
53	cache/sqlite3/qsql_sqlite3.cpp
54	cache/sqlite3/qsqlcachedresult.h
55	cache/sqlite3/qsql_sqlite3.h
56	)
57	# ELSE (SQLITE_FOUND)
58	# MESSAGE(SEND_ERROR "The QT3 version requires sqlite3 but could not found")
59	# ENDIF (SQLITE_FOUND)
60
61	SET(CACHEINST_HEADERS	48	SET(CACHEINST_HEADERS
62	cache/LogCache.hpp	49	cache/LogCache.hpp
63	cache/ReposLog.hpp	50	cache/ReposLog.hpp
Lines 150-156 Link Here
150		137
151	# IF (SQLITE_FOUND)	138	# IF (SQLITE_FOUND)
152	TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})	139	TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
153	INCLUDE_DIRECTORIES(SQLITE_INCLUDE_DIR)	140	INCLUDE_DIRECTORIES(${SQLITE_INCLUDE_DIR})
154	# ELSE (SQLITE_FOUND)	141	# ELSE (SQLITE_FOUND)
155	# TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})	142	# TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_QTSQL_LIBRARY})
156	# ENDIF (SQLITE_FOUND)	143	# ENDIF (SQLITE_FOUND)

Lines 10-18 Link Here

(-)trinity-tdesvn-14.0.0~pre185+fddfb277/src/svnqt/cache/LogCache.cpp.sqlite3 (-6 / +2 lines)
10	#include "svnqt/cache/DatabaseException.hpp"	10	#include "svnqt/cache/DatabaseException.hpp"
11		11
12	#ifndef NO_SQLITE3	12	#ifndef NO_SQLITE3
13	#include "sqlite3/qsql_sqlite3.h"	13	#include <qsql_sqlite3.h>
14	#define SQLTYPE "QSQLITE3"	14	#define SQLTYPE "QSQLITE3"
15	#else	15	#else
		16	#include <qsql_sqlite.h>
16	#define SQLTYPE "QSQLITE"	17	#define SQLTYPE "QSQLITE"
17	#endif	18	#endif
18		19
Lines 262-272 Link Here
262		263
263	void LogCache::setupMainDb()	264	void LogCache::setupMainDb()
264	{	265	{
265	#ifndef NO_SQLITE3
266	if (!TQSqlDatabase::isDriverAvailable(SQLTYPE)) {
267	TQSqlDatabase::registerSqlDriver(SQLTYPE,new TQSqlDriverCreator<TQSQLite3Driver>);
268	}
269	#endif
270	TQDataBase mainDB = m_CacheData->getMainDB();	266	TQDataBase mainDB = m_CacheData->getMainDB();
271	if (!mainDB \|\| !mainDB->open()) {	267	if (!mainDB \|\| !mainDB->open()) {
272	tqWarning("Failed to open main database: %s", (mainDB?mainDB->lastError().text().TOUTF8().data():"No database object."));	268	tqWarning("Failed to open main database: %s", (mainDB?mainDB->lastError().text().TOUTF8().data():"No database object."));