From 4e3c479a0f279926e0bd9a359a0ee57b334e976e Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Fri, 8 Dec 2017 14:22:19 +0100
Subject: Replaced tinytoml with libconfig

---
 smolbote.qbs | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

(limited to 'smolbote.qbs')

diff --git a/smolbote.qbs b/smolbote.qbs
index 6d991eb..d18af60 100644
--- a/smolbote.qbs
+++ b/smolbote.qbs
@@ -49,6 +49,9 @@ Project {
         Depends {
             name: "downloads"
         }
+        Depends {
+            name: "settings"
+        }
 
         Probe {
             id: git
@@ -65,24 +68,23 @@ Project {
         }
 
         // global includes
-        cpp.includePaths: ['src', 'src/3rd-party', 'src/lib']
+        cpp.includePaths: ['src', 'src/3rd-party', 'src/lib', 'lib']
         // global defines
         cpp.defines: {
             if(project.deprecatedWarnings)
                 defines.push("QT_DEPRECATED_WARNINGS", "QT_DISABLE_DEPRECATED_BEFORE="+project.deprecatedBefore);
             return defines;
         }
-        cpp.cxxLanguageVersion: "c++11"
+        cpp.cxxLanguageVersion: "c++17"
+
+        cpp.linkerFlags: libconfig.libs
 
         Group {
             name: "main"
             files: [
                 "src/browser.cpp",
                 "src/browser.h",
-                "src/interfaces.h",
                 "src/main.cpp",
-                "src/settings.cpp",
-                "src/settings.h",
                 "src/singleapplication.cpp",
                 "src/singleapplication.h",
             ]
@@ -114,7 +116,7 @@ Project {
                 "src/widgets/webviewtabbar.h",
             ]
         }
-
+/*
         Group {
             name: "Request Filter"
             files: [
@@ -140,7 +142,7 @@ Project {
                 return defines;
             }
         }
-
+*/
         Group {
             name: "Profile"
             files: [
@@ -168,18 +170,6 @@ Project {
             qbs.install: true
             qbs.installDir: "bin"
         }
-
-        Group {
-            name: "Configuration"
-            files: [
-                "data/poi.toml",
-            ]
-            qbs.install: true
-            qbs.installDir: "share/smolbote"
-        }
     } // CppApplication poi
 
-    //SubProject {
-    //    filePath: "src/plugins/plugins.qbs"
-    //}
 }
-- 
cgit v1.2.1