diff options
| author | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-01-14 15:56:50 +0100 |
|---|---|---|
| committer | Aqua-sama <aqua@iserlohn-fortress.net> | 2018-01-14 15:56:50 +0100 |
| commit | 5a66a9ad3ff3c11da88fca48101116f7ab1c6eff (patch) | |
| tree | 6ac772b8b7002f2605bc23282d02f7c84da671f1 | |
| parent | CookieInterceptor, making all cookies session cookies (diff) | |
| download | smolbote-5a66a9ad3ff3c11da88fca48101116f7ab1c6eff.tar.xz | |
Minor fixes
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | README.md | 3 | ||||
| -rw-r--r-- | data/poi.cfg | 4 | ||||
| -rw-r--r-- | src/main.cpp | 2 | ||||
| -rw-r--r-- | src/version.h.in | 4 | ||||
| -rw-r--r-- | tools/qbs/GitRepo.js | 12 |
6 files changed, 6 insertions, 20 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e7c7296..12afb57 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,6 +49,7 @@ add_subdirectory(lib/downloads) add_subdirectory(lib/navigation) # configure a header file to pass version information +# if you don't have git, or are building this off the source tarball, define versions in version.h.in execute_process(COMMAND "git" "describe" WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE GitDescribe OUTPUT_STRIP_TRAILING_WHITESPACE) execute_process(COMMAND "git" "describe" "--abbrev=0" WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE GitVersion OUTPUT_STRIP_TRAILING_WHITESPACE) configure_file(src/version.h.in "${PROJECT_BINARY_DIR}/version.h") @@ -20,9 +20,6 @@ You make it yourself. Then you _poi_. Do you know what makepkg is? Then take a look in linux/makepkg/. -Do you know what a compiler is? Great, glance at docs/manual/Building.md for -instructions. - ### It doesn't work, what now? Drop me an email at _aqua at iserlohn dash fortress dot net_. diff --git a/data/poi.cfg b/data/poi.cfg index dd8af64..26a4c34 100644 --- a/data/poi.cfg +++ b/data/poi.cfg @@ -36,8 +36,8 @@ browser = { // tabs tabClose = "Ctrl+X"; - tabLeft = "Shift+Left"; - tabRight = "Shift+Right"; + tabLeft = "Ctrl+O"; + tabRight = "Ctrl+P"; }; }; diff --git a/src/main.cpp b/src/main.cpp index 57389bf..ca27783 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -11,8 +11,6 @@ #include "version.h" #include <QCommandLineParser> #include <QDir> -#include <QFile> -#include <QFileInfo> #include <QStandardPaths> #include <iostream> diff --git a/src/version.h.in b/src/version.h.in index 1ec633a..bcb28d3 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -1,7 +1,9 @@ #ifndef VERSION_H #define VERSION_H +// git describe --abbrev=0, 0.2.0 #define GIT_VERSION "@GitVersion@" +// git describe, 0.2.0-15-g3b2d3c4 #define GIT_DESCRIBE "@GitDescribe@" -#endif //VERSION_H
\ No newline at end of file +#endif //VERSION_H diff --git a/tools/qbs/GitRepo.js b/tools/qbs/GitRepo.js deleted file mode 100644 index f3431f9..0000000 --- a/tools/qbs/GitRepo.js +++ /dev/null @@ -1,12 +0,0 @@ -var Process = require("qbs.Process") - -function read(workingDirectory) { - var git = new Process(); - git.setWorkingDirectory(workingDirectory); - - var meta = Object.create(null); - git.exec("git", ["describe", "--long"], true); - meta.version = git.readLine(); - - return meta; -} |