From 5fe7f60a152ace8fb6da378c6fcb83ba0c2c9f59 Mon Sep 17 00:00:00 2001
From: Aqua-sama <aqua@iserlohn-fortress.net>
Date: Thu, 14 Dec 2017 18:40:27 +0100
Subject: Using Q_CHECK_PTR instead of Q_ASSERT on pointers

---
 smolbote.qbs | 55 +++++++++++++++----------------------------------------
 1 file changed, 15 insertions(+), 40 deletions(-)

(limited to 'smolbote.qbs')

diff --git a/smolbote.qbs b/smolbote.qbs
index f00b930..8229ba3 100644
--- a/smolbote.qbs
+++ b/smolbote.qbs
@@ -29,6 +29,20 @@ Project {
         name: "libconfig++"
     }
 
+    Probe {
+        id: git
+        property string version: ""
+        property string describe: ""
+        configure: {
+            if(project.gitVersion) {
+                var meta = GitRepo.read(project.sourceDirectory);
+                version = meta.version;
+                describe = meta.describe;
+                found = true;
+            }
+        }
+    }
+
     CppApplication {
         id: poi
         name: "poi"
@@ -46,22 +60,8 @@ Project {
         Depends { name: "settings" }
         Depends { name: "settingsDialog" }
 
-        Probe {
-            id: git
-            property string version: ""
-            property string describe: ""
-            configure: {
-                if(project.gitVersion) {
-                    var meta = GitRepo.read(project.sourceDirectory);
-                    version = meta.version;
-                    describe = meta.describe;
-                    found = true;
-                }
-            }
-        }
-
         // global includes
-        cpp.includePaths: ['src', 'src/3rd-party', 'src/lib', 'lib']
+        cpp.includePaths: ['src', 'src/lib', 'lib']
         // global defines
         cpp.defines: {
             if(project.deprecatedWarnings)
@@ -120,31 +120,6 @@ Project {
             ]
         }
 
-/*
-        Group {
-            name: "Request Filter"
-            files: [
-                "src/filter/blockermanager.cpp",
-                "src/filter/blockermanager.h",
-                "src/filter/filtercollection.cpp",
-                "src/filter/filtercollection.h",
-                "src/filter/filtertree.cpp",
-                "src/filter/filtertree.h",
-                "src/filter/regexp.cpp",
-                "src/filter/regexp.h",
-                "src/filter/subscriptiondialog.ui",
-                "src/filter/subscriptionform.ui",
-                "src/webengine/urlinterceptor.cpp",
-                "src/webengine/urlinterceptor.h",
-            ]
-            cpp.defines: {
-                if(project.deprecatedWarnings)
-                    defines.push("QT_DEPRECATED_WARNINGS", "QT_DISABLE_DEPRECATED_BEFORE="+project.deprecatedBefore);
-                defines.push("DEBUG_VERBOSE")
-                return defines;
-            }
-        }
-*/
         Group {
             name: "Profile"
             files: [
-- 
cgit v1.2.1