Tests: Fix DB.

src/tests/common/main.cpp

@@ -2,4 +2,4 @@
 
 #include "test.h"
 
-QTEST_APPLESS_MAIN(Test)
+QTEST_MAIN(Test)

src/tests/db/Db.pro

@@ -28,4 +28,9 @@ HEADERS += \
     $$UIPATH/util/fileutil.h \
     $$UIPATH/util/net/netutil.h
 
-include($$UIPATH/db/sqlite/sqlite.pri)
+# Database Migrations
+RESOURCES += $$UIPATH/db/migrations.qrc
+
+# 3rd party integrations
+CONFIG += sqlite
+include($$UIPATH/3rdparty/3rdparty.pri)

src/tests/db/test.cpp

@@ -5,11 +5,11 @@
 #include "commontest.h"
 #include "db/databasemanager.h"
 #include "db/quotamanager.h"
-#include "db/sqlite/sqlitedb.h"
-#include "db/sqlite/sqlitestmt.h"
 #include "fortsettings.h"
 #include "util/dateutil.h"
 #include "util/fileutil.h"
+#include <sqlite/sqlitedb.h>
+#include <sqlite/sqlitestmt.h>
 
 void Test::dbWriteRead()
 {
@@ -21,9 +21,9 @@ void Test::dbWriteRead()
     QVERIFY(databaseManager.initialize());
 
     const QStringList appPaths = QStringList()
-            << "C:\test\test.exe"
+            << "C:\\test\\test.exe"
-            << "C:\test\test2.exe"
+            << "C:\\test\\test2.exe"
-            << "C:\test\test3.exe";
+            << "C:\\test\\test3.exe";
 
     const quint16 procCount = 3;
     QCOMPARE(int(procCount), appPaths.size());

src/ui/3rdparty/3rdparty.pri

@@ -1,4 +1,9 @@
-include (qcustomplot/qcustomplot.pri)
+qcustomplot {
-include (sqlite/sqlite.pri)
+    include (qcustomplot/qcustomplot.pri)
+}
+
+sqlite {
+    include (sqlite/sqlite.pri)
+}
 
 INCLUDEPATH += $$PWD

src/ui/FortFirewall.pro

@@ -186,4 +186,5 @@ installer_build {
 }
 
 # 3rd party integrations
+CONFIG += qcustomplot sqlite
 include(3rdparty/3rdparty.pri)