summaryrefslogtreecommitdiffstats
path: root/src/svnqt
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-26 22:46:37 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-26 22:46:37 -0600
commit4ce4baa8d68bdbc6f7e49f17338e61b9f2598332 (patch)
tree9e90b96a7deb79033f75b418347739d0b164570c /src/svnqt
parenta151d8a541f46d96737cf8d9057d956200d7e6e8 (diff)
downloadtdesvn-4ce4baa8d68bdbc6f7e49f17338e61b9f2598332.tar.gz
tdesvn-4ce4baa8d68bdbc6f7e49f17338e61b9f2598332.zip
Update svn/sqlite cmake detection
Diffstat (limited to 'src/svnqt')
-rw-r--r--src/svnqt/CMakeLists.txt2
-rw-r--r--src/svnqt/cache/LogCache.cpp6
-rw-r--r--src/svnqt/cache/LogCache.hpp1
3 files changed, 5 insertions, 4 deletions
diff --git a/src/svnqt/CMakeLists.txt b/src/svnqt/CMakeLists.txt
index 035dd38..563e7ff 100644
--- a/src/svnqt/CMakeLists.txt
+++ b/src/svnqt/CMakeLists.txt
@@ -146,7 +146,7 @@ SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES
SET(ALL_LINKFLAGS ${APR_EXTRA_LIBFLAGS})
SET(ALL_LINKFLAGS "${ALL_LINKFLAGS} ${APU_EXTRA_LIBFLAGS}")
SET_TARGET_PROPERTIES(${svnqt-name} PROPERTIES LINK_FLAGS "${ALL_LINKFLAGS} ${LINK_NO_UNDEFINED}")
-TARGET_LINK_LIBRARIES(${svnqt-name} ${QT_LIBRARIES} ${SUBVERSION_ALL_LIBS})
+TARGET_LINK_LIBRARIES(${svnqt-name} ${TQT_LIBRARIES} ${SUBVERSION_ALL_LIBS})
# IF (SQLITE_FOUND)
TARGET_LINK_LIBRARIES(${svnqt-name} ${SQLITE_LIBRARIES})
diff --git a/src/svnqt/cache/LogCache.cpp b/src/svnqt/cache/LogCache.cpp
index 9534834..fd62eee 100644
--- a/src/svnqt/cache/LogCache.cpp
+++ b/src/svnqt/cache/LogCache.cpp
@@ -187,7 +187,7 @@ public:
TQDataBase db = TQSqlDatabase::addDatabase(SQLTYPE,_key);
db->setDatabaseName(m_BasePath+"/maindb.db");
if (!db->open()) {
- qWarning("Failed to open main database: " + db->lastError().text());
+ qWarning(TQString("Failed to open main database: " + db->lastError().text()).ascii());
} else {
m_mainDB.setLocalData(new ThreadDBStore);
m_mainDB.localData()->key = _key;
@@ -269,12 +269,12 @@ void LogCache::setupMainDb()
#endif
TQDataBase mainDB = m_CacheData->getMainDB();
if (!mainDB || !mainDB->open()) {
- qWarning("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object."));
+ qWarning(TQString("Failed to open main database: " + (mainDB?mainDB->lastError().text():"No database object.")).ascii());
} else {
TQSqlQuery q(TQString(), mainDB);
mainDB->transaction();
if (!q.exec("CREATE TABLE IF NOT EXISTS \""+TQString(SQLMAINTABLE)+"\" (\"reposroot\" TEXT,\"id\" INTEGER PRIMARY KEY NOT NULL);")) {
- qWarning("Failed create main database: " + mainDB->lastError().text());
+ qWarning(TQString("Failed create main database: " + mainDB->lastError().text()).ascii());
}
mainDB->commit();
}
diff --git a/src/svnqt/cache/LogCache.hpp b/src/svnqt/cache/LogCache.hpp
index e0a7f02..eaaf37a 100644
--- a/src/svnqt/cache/LogCache.hpp
+++ b/src/svnqt/cache/LogCache.hpp
@@ -3,6 +3,7 @@
#include <tqstring.h>
#include <tqdir.h>
+#include <tqmutex.h>
#include "svnqt/svnqt_defines.hpp"
#include "svnqt/shared_pointer.hpp"