amass/qtpromise
1
0
Fork 0
mirror of https://github.com/simonbrunel/qtpromise.git synced 2024-11-21 18:24:29 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bump version to 0.6.0

Browse Source
This commit is contained in:
Simon Brunel 2020-10-01 23:00:38 +02:00
parent 1752255e7b
commit f7639e921e
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -4,7 +4,7 @@ if(DEFINED PROJECT_NAME)
set(SUBPROJECT ON)
endif()
project(qtpromise VERSION 0.5.0 LANGUAGES CXX)
project(qtpromise VERSION 0.6.0 LANGUAGES CXX)
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")

8
docs/qtpromise/getting-started.md
View File

@ -28,7 +28,7 @@ installed either as a [`subtree`](#subtree) or a [`submodule`](#submodule). Read
commands in ["Git: submodules vs subtrees"](https://nering.dev/2016/git-submodules-vs-subtrees/)
which provides a good comparison between these two workflows.
The following examples install QtPromise version 0.5.0 under the `3rdparty/qtpromise` subdirectory.
The following examples install QtPromise version 0.6.0 under the `3rdparty/qtpromise` subdirectory.
Note that the install directory is arbitrary and can be any empty directory under your repository.
Once installed, refer to the [CMake](#cmake) or [qmake](#qmake) sections for details of integrating
QtPromise into your project.
@ -38,7 +38,7 @@ QtPromise into your project.
```sh
cd <your/project/repository>
git remote add qtpromise https://github.com/simonbrunel/qtpromise.git
git subtree add -P 3rdparty/qtpromise qtpromise v0.5.0 --squash -m "Add QtPromise v0.5.0"
git subtree add -P 3rdparty/qtpromise qtpromise v0.6.0 --squash -m "Add QtPromise v0.6.0"
```
#### submodule
@ -47,10 +47,10 @@ git subtree add -P 3rdparty/qtpromise qtpromise v0.5.0 --squash -m "Add QtPromis
cd <your/project/repository>
git submodule add https://github.com/simonbrunel/qtpromise.git 3rdparty/qtpromise
cd 3rdparty/qtpromise
git checkout v0.5.0
git checkout v0.6.0
cd ../..
git add 3rdparty/qtpromise
git commit -m "Add QtPromise v0.5.0"
git commit -m "Add QtPromise v0.6.0"
```
### Download

2
qpm.json
View File

@ -10,7 +10,7 @@
"url": "https://github.com/simonbrunel/qtpromise.git"
},
"version": {
"label": "0.5.0"
"label": "0.6.0"
},
"license": "MIT",
"pri_filename": "qtpromise.pri",