aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAqua-sama <aqua@iserlohn-fortress.net>2017-02-17 17:11:33 +0100
committerAqua-sama <aqua@iserlohn-fortress.net>2017-02-17 17:11:33 +0100
commita8a168ec6ccfa3a8ec4243ebf0ccaaf86a13b2a2 (patch)
tree9f1d9c4a79816a7e9003935362ca79d19304c5c6
parentAdded deprecated API warnings (diff)
downloadsmolbote-a8a168ec6ccfa3a8ec4243ebf0ccaaf86a13b2a2.tar.xz
Moved smolbote.qbs
-rw-r--r--BUILDING.md4
-rw-r--r--data/icon.svg (renamed from src/data/icon.svg)0
-rw-r--r--data/resources.qrc (renamed from src/data/resources.qrc)0
-rw-r--r--qbs/GitRepo.js (renamed from src/GitRepo.js)0
-rw-r--r--smolbote.qbs (renamed from src/smolbote.qbs)90
5 files changed, 47 insertions, 47 deletions
diff --git a/BUILDING.md b/BUILDING.md
index 03a95c6..2af8d4b 100644
--- a/BUILDING.md
+++ b/BUILDING.md
@@ -23,11 +23,11 @@ and Managing Qt versions.
* Run qbs
```
-[smolbote repo]$ qbs build --build-directory build --file src/smolbote.qbs profile:qt5 release
+[smolbote repo]$ qbs build --build-directory build profile:qt5 release
```
Shortened:
```
-[smolbote repo]$ qbs build -d build -f src/smolbote.qbs profile:qt5 release
+[smolbote repo]$ qbs build -d build profile:qt5 release
```
This installs the files to build/release/install-root.
diff --git a/src/data/icon.svg b/data/icon.svg
index a2ae055..a2ae055 100644
--- a/src/data/icon.svg
+++ b/data/icon.svg
diff --git a/src/data/resources.qrc b/data/resources.qrc
index c29d7fe..c29d7fe 100644
--- a/src/data/resources.qrc
+++ b/data/resources.qrc
diff --git a/src/GitRepo.js b/qbs/GitRepo.js
index d7e19a7..d7e19a7 100644
--- a/src/GitRepo.js
+++ b/qbs/GitRepo.js
diff --git a/src/smolbote.qbs b/smolbote.qbs
index 439014c..1ef8407 100644
--- a/src/smolbote.qbs
+++ b/smolbote.qbs
@@ -1,5 +1,5 @@
import qbs
-import "GitRepo.js" as GitRepo
+import "qbs/GitRepo.js" as GitRepo
Project {
id: project
@@ -36,7 +36,7 @@ Project {
}
}
- cpp.includePaths: ['.']
+ cpp.includePaths: ['src']
cpp.defines: {
if(project.deprecatedWarnings)
defines.push("QT_DEPRECATED_WARNINGS", "QT_DISABLE_DEPRECATED_BEFORE=0x050700");
@@ -46,51 +46,51 @@ Project {
}
files: [
- "browser.cpp",
- "browser.h",
"data/icon.svg",
"data/resources.qrc",
- "forms/blockerdialog.cpp",
- "forms/blockerdialog.h",
- "forms/blockerdialog.ui",
- "forms/bookmarksdialog.cpp",
- "forms/bookmarksdialog.h",
- "forms/bookmarksdialog.ui",
- "forms/downloaddialog.cpp",
- "forms/downloaddialog.h",
- "forms/downloaddialog.ui",
- "forms/profiledialog.cpp",
- "forms/profiledialog.h",
- "forms/profiledialog.ui",
- "main.cpp",
- "mainwindow.cpp",
- "mainwindow.h",
- "mainwindow.ui",
- "settings.cpp",
- "settings.h",
- "webengine/blockerrule.cpp",
- "webengine/blockerrule.h",
- "webengine/blockersubscription.cpp",
- "webengine/blockersubscription.h",
- "webengine/downloaditemform.cpp",
- "webengine/downloaditemform.h",
- "webengine/downloaditemform.ui",
- "webengine/regexp.cpp",
- "webengine/regexp.h",
- "webengine/urlinterceptor.cpp",
- "webengine/urlinterceptor.h",
- "webengine/webengineprofile.cpp",
- "webengine/webengineprofile.h",
- "webengine/webview.cpp",
- "webengine/webview.h",
- "widgets/loadingbar.cpp",
- "widgets/loadingbar.h",
- "widgets/urllineedit.cpp",
- "widgets/urllineedit.h",
- "widgets/webviewtabbar.cpp",
- "widgets/webviewtabbar.h",
- "xbel/xbel.cpp",
- "xbel/xbel.h",
+ "src/browser.cpp",
+ "src/browser.h",
+ "src/forms/blockerdialog.cpp",
+ "src/forms/blockerdialog.h",
+ "src/forms/blockerdialog.ui",
+ "src/forms/bookmarksdialog.cpp",
+ "src/forms/bookmarksdialog.h",
+ "src/forms/bookmarksdialog.ui",
+ "src/forms/downloaddialog.cpp",
+ "src/forms/downloaddialog.h",
+ "src/forms/downloaddialog.ui",
+ "src/forms/profiledialog.cpp",
+ "src/forms/profiledialog.h",
+ "src/forms/profiledialog.ui",
+ "src/main.cpp",
+ "src/mainwindow.cpp",
+ "src/mainwindow.h",
+ "src/mainwindow.ui",
+ "src/settings.cpp",
+ "src/settings.h",
+ "src/webengine/blockerrule.cpp",
+ "src/webengine/blockerrule.h",
+ "src/webengine/blockersubscription.cpp",
+ "src/webengine/blockersubscription.h",
+ "src/webengine/downloaditemform.cpp",
+ "src/webengine/downloaditemform.h",
+ "src/webengine/downloaditemform.ui",
+ "src/webengine/regexp.cpp",
+ "src/webengine/regexp.h",
+ "src/webengine/urlinterceptor.cpp",
+ "src/webengine/urlinterceptor.h",
+ "src/webengine/webengineprofile.cpp",
+ "src/webengine/webengineprofile.h",
+ "src/webengine/webview.cpp",
+ "src/webengine/webview.h",
+ "src/widgets/loadingbar.cpp",
+ "src/widgets/loadingbar.h",
+ "src/widgets/urllineedit.cpp",
+ "src/widgets/urllineedit.h",
+ "src/widgets/webviewtabbar.cpp",
+ "src/widgets/webviewtabbar.h",
+ "src/xbel/xbel.cpp",
+ "src/xbel/xbel.h",
]
Depends { name: "Qt"; submodules: ["core", "widgets", "webengine", "webenginewidgets"] }