Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CQtDeployer: fixed various small glitches in the english documentation #702

Merged
merged 3 commits into from
Jul 20, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 12 additions & 8 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,13 +1,17 @@
# QuassarApp operation rules

## General rules

### QuasarApp internal developers

* if there is no instruction to complete the task, separate you new branch from the version branch (for example v1.x).
* Realize the task
* At the end of the work, create a pull request to the branch from which you created the branch.
Example:
I made corrections for version 1.5 and created a new branch from branch v1.5, which means that I should create a pull request to branch v1.5,

### External QuasarApp Developers

* Making Fork repository.
* Switch to the branch of the version in which you need to perform the correction (example of the names of the branch with the version: v1.x).
* Realize the task
Expand All @@ -18,26 +22,26 @@ I made corrections for version 1.5 and created a new branch from branch v1.5, wh

### Forbidden

* Using 'push force'. All conflicts need to be solved by a new commite.
* Using 'push force'. All conflicts need to be solved by a new commit.
* Push code directly to master.
* Break the code design rules. If some aspect is not described, you need to write in the same style as it was written before you.
* Break the code design rules. If some aspect is not described, you need to write in the same style as it was written before your change.
* Move the code for no particular reason.


## Making Pull Request

The content of the pull request must include:
* The number of the task that solves (if performed according to the task)
* The number of the task that is solved (if performed according to the task)
* A complete description of everything that was done in the task.
* In the case when a pull creation is created and you still work on the task, change the header of the pool request by adding a WIP tag to the beginning (example [WIP] MyTask)
* Pull Request must always be assigned to the branch from which you separated.
* Pull Request must always be assigned to the branch from which you branched (started to work).

## Making Tasks
If necessary, assign a task to someone

If necessary, assign a task to someone.
You must:
* Create relevant discussion on github, selected repository.
* Create relevant discussion on github for the specific repository.
* Completely describe the problem or task.
* If you have a solution to the problem fully describe what and how to do.
* If you have a solution to the problem, then describe in detail what and how it should be done.

## Code Guideline

Expand Down
2 changes: 1 addition & 1 deletion CQtDeployer/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {


if (!QuasarAppUtils::Params::parseParams(argc, argv, DeployCore::avilableOptions())) {
QuasarAppUtils::Params::log("Wrong parameters. Please use the 'help' of 'h' option for show help page.", QuasarAppUtils::Warning);
QuasarAppUtils::Params::log("Wrong parameters. Please use the 'help' of 'h' option to show the help page.", QuasarAppUtils::Warning);
exit(4);
}

Expand Down
10 changes: 5 additions & 5 deletions examples/TestQMLWidgets/README.md
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
# This example for packing apps to snap
You need to build your project with your own qt version
You need to build your project with your own Qt version.

1. cd ~/ # go to home dir
2. snap install cqtdeployer # install cqtdeployer from snap store
3. git clone https://github.com/QuasarApp/CQtDeployer.git # clone this project
4. cd Console-QtDeployer/examples/TestQMLWidgets # go to folder with example
5. /path/to/your/qmake/bin/qmake TestQMLWidgets.pro # run your qmake for this example
6. make # build example
7. cqtdeployer -bin ./build/TestQMLWidgets -qmake /path/to/your/qmake/bin/qmake -qmlDir ./ -targetDir ./distro
# run cqtdeployer for deploy example project
7. cqtdeployer -bin ./build/TestQMLWidgets -qmake /path/to/your/qmake/bin/qmake -qmlDir ./ -targetDir ./distro
# run cqtdeployer for deploy example project
8. snapcraft # create snapcraft build
9. snap install cqtdeployerexample_0.1_amd64.snap --dangerous # install this example
10.cqtdeployerexample # check
Done!
10. cqtdeployerexample # check

Done!