- more fixes

client/CMakeLists.txt

@@ -33,6 +33,7 @@ find_package (Qt5Core REQUIRED)
 find_package (Qt5Widgets REQUIRED) # Equivalent of QT += widgets
 find_package (Qt5PrintSupport REQUIRED)
 find_package (Qt5OpenGL REQUIRED)
+find_package (Qt5Network REQUIRED)
 
 if (Qt5OpenGL_FOUND)
     message("Qt5 OpenGL found")
@@ -128,12 +129,14 @@ add_executable(${EXE_NAME}
     ${RESOURCE_FILES}
     ${WINDOWS_RESOURCE_PATH})
 
+message("OpenSSL include: ${OPENSSL_INCLUDE}")
+
 target_include_directories(${EXE_NAME} SYSTEM BEFORE
-    #PUBLIC ${UUID_INCLUDE}
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/sqlitecpp/include
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/sqlitecpp/sqlite3/include
     PUBLIC ${OPENSSL_INCLUDE}
     PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../lib/uuid/include
+    PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/fervor
     )
 
 

client/encryption.h

@@ -2,8 +2,8 @@
 #define ENCRYPTION_H
 
 #include <QByteArray>
-#include <openssl/blowfish.h">
+#include "openssl/blowfish.h"
-#include <openssl/sha.h>
+#include "openssl/sha.h"
 #include "twofish.h"
 
 class BlowfishCipher

client/fervor/CMakeLists.txt

@@ -6,6 +6,7 @@ option (FERVOR_BUILD_TESTS "Should the tests be built" OFF)
 
 find_package (Qt5Core REQUIRED)
 find_package (Qt5Gui REQUIRED)
+find_package (Qt5Network REQUIRED)
 
 set (QT_USE_QTNETWORK true)
 set (QT_USE_QTWEBKIT true)

client/main.cpp

@@ -1,6 +1,8 @@
 #include "mainwindow.h"
 #include <QApplication>
 #include <QLayout>
+#include <QFileInfo>
+#include <QDir>
 #include "settings.h"
 #include "helper.h"
 
@@ -20,14 +22,14 @@ int main(int argc, char *argv[])
     Storage::instance().setPath(path);
 
     // Check if file exists at all
-    if (!QFile::exists(path))
+    /*if (!QFile::exists(path))
     {
         // Show dialog that requests database path
     }
     else
     {
         // Check if password is available
-        if (mSettings->data()[KEY_AUTOSAVE_PASSWORD].toBool())
+        if (Settings::instance().data()[KEY_AUTOSAVE_PASSWORD].toBool())
         {
             QString password = helper::password::load();
             if (password.isEmpty())
@@ -47,7 +49,7 @@ int main(int argc, char *argv[])
         }
         else
             askDbPassword(QString());
-    }
+    }*/
 
 
     MainWindow w;