diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 6c78bf6..0000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "qbs-shared"] - path = qbs/shared - url = git://github.com/lirios/qbs-shared - branch = master diff --git a/.travis.yml b/.travis.yml index f410f7a..d3bf80f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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 diff --git a/README.md b/README.md index 96ad8b1..d92c056 100644 --- a/README.md +++ b/README.md @@ -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 @@ -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. diff --git a/qbs/shared b/qbs/shared deleted file mode 160000 index a42c187..0000000 --- a/qbs/shared +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a42c187bca324ad04e03624cca6508d44a5cd132 diff --git a/qtgsettings.qbs b/qtgsettings.qbs index 902d024..534c846 100644 --- a/qtgsettings.qbs +++ b/qtgsettings.qbs @@ -12,8 +12,6 @@ Project { minimumQbsVersion: "1.8" - qbsSearchPaths: ["qbs/shared"] - references: [ "src/deployment.qbs", "src/gsettings/gsettings.qbs", diff --git a/src/gsettings/gsettings.qbs b/src/gsettings/gsettings.qbs index d910782..b8fc13f 100644 --- a/src/gsettings/gsettings.qbs +++ b/src/gsettings/gsettings.qbs @@ -1,6 +1,6 @@ import qbs 1.0 import qbs.Probes -import "../../qbs/shared/imports/LiriUtils.js" as LiriUtils +import LiriUtils LiriModuleProject { id: root