Skip to content

Commit

Permalink
Remove qbs-shared submodule
Browse files Browse the repository at this point in the history
  • Loading branch information
plfiorini committed Jul 26, 2017
1 parent 4912fea commit 5d0516c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 13 deletions.
4 changes: 0 additions & 4 deletions .gitmodules

This file was deleted.

2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@ env:
- secure: "bm/tcZDotHXlMxvnDRZP/qKoSs0u7xegyl4U9QMEgWQlMiBJHLx6v0ztxygqOCq8kV6uYxKGdKRegDH6pjdA8HtSfrqLLZUhhDoye7Qcr+ShyTWEYxVfyAJpPnPHF3HfBow2KjUZGem53GxxrhKGjwbIII4FTphoY7G1b3rwDfOcBzXvxOjsVGTnx5JY3J2fJ2L1iEsd7sk1rKOzcGqcLnm4rlLlaCtS0dRnDG1DAaYkWgF6XInx0vNtKxeNlRsULS2q6Ivj54iJVVg41+Lxb3QEqjniEqVHbuIPAV786+eykh04ZWhVgxmeS1lpCiqnCkxXhj7YXlpsGlXMskmjc5Dx7/zVugQ4zTXTUD3tm+Lz9mkzhUSTa6L+Oh2dKV/KnR9pkU75oH6Xwn+l451azyJvSmt7XZycAHg+6Vukusv1esipfsbDz8uDTl8jYAVVxWsq0MnGtBS5ZYoXCKtyna4dHaoVlG9eIY47CTzGUy1EpbhRSag+oJwmMy8BmjB15YTHy3+WFssqaRF55sZHCOGOvy9bW4CUzTJ0CaUnCa/01XzKio1e50pxij3Pp4vNh6DCJNeoOOGDtLVpo+Ill52mKdnY0Uj+gLFn9QoNGqmvPjU5Wfgg2qYmI7k+7rK+eGEG3Jvpt1CgD2dCUT9BjBRVzcQPyBX6GAyTgqLYmno="

arch:
artifacts:
- qbs-shared-artifacts.tar.gz
packages:
- qbs
- qt5-declarative
Expand Down
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ Qt >= 5.8.0 with at least the following modules is required:

The following modules and their dependencies are required:

* [qbs-shared](https://github.com/lirios/qbs-shared.git)
* [glib >= 2.31.0](https://git.gnome.org/browse/glib)

## Installation
Expand Down Expand Up @@ -47,12 +48,13 @@ On the last `qbs` line, you can specify additional configuration parameters at t
The following are only needed if `qbs.installPrefix` is a system-wide path such as `usr`
and the default value doesn't suit your needs. All are relative to `qbs.installRoot`:

* `lirideployment.libDir:path/to/lib` where libraries are installed (default: `lib`)
* `lirideployment.qmlDir:path/to/qml` where QML plugins are installed (default: `lib/qml`)
* `lirideployment.pluginsDir:path/to/plugins` where Qt plugins are installed (default: `lib/plugins`)
* `lirideployment.qbsModulesDir:path/to/qbs` where Qbs modules are installed (default: `share/qbs/modules`)
* `modules.lirideployment.libDir:path/to/lib` where libraries are installed (default: `lib`)
* `modules.lirideployment.qmlDir:path/to/qml` where QML plugins are installed (default: `lib/qml`)
* `modules.lirideployment.pluginsDir:path/to/plugins` where Qt plugins are installed (default: `lib/plugins`)
* `modules.lirideployment.qbsModulesDir:path/to/qbs` where Qbs modules are installed (default: `share/qbs/modules`)

See `qbs/shared/modules/lirideployment/lirideployment.qbs` for more deployment-related parameters.
See [lirideployment.qbs](https://github.com/lirios/qbs-shared/blob/develop/modules/lirideployment/lirideployment.qbs)
for more deployment-related parameters.

If you specify `qbs.installRoot` you might need to prefix the entire line with `sudo`,
depending on whether you have permissions to write there or not.
Expand Down
1 change: 0 additions & 1 deletion qbs/shared
Submodule shared deleted from a42c18
2 changes: 0 additions & 2 deletions qtgsettings.qbs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ Project {

minimumQbsVersion: "1.8"

qbsSearchPaths: ["qbs/shared"]

references: [
"src/deployment.qbs",
"src/gsettings/gsettings.qbs",
Expand Down
2 changes: 1 addition & 1 deletion src/gsettings/gsettings.qbs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import qbs 1.0
import qbs.Probes
import "../../qbs/shared/imports/LiriUtils.js" as LiriUtils
import LiriUtils

LiriModuleProject {
id: root
Expand Down

0 comments on commit 5d0516c

Please sign in to comment.