92185d417d
The BASE argument of qt_add_resources now denotes the root point of the
alias of the file. Before, BASE was merely prepended to every file that
got passed to qt_add_resources.
Old behavior:
qt_add_resources(app "images"
PREFIX "/"
BASE "../shared"
FILES "images/button.png")
Alias is "../shared/images/button.png", and pro2cmake generated
QT_RESOURCE_ALIAS assignments to fix this.
New behavior:
qt_add_resources(app "images"
PREFIX "/"
BASE "../shared"
FILES "../shared/images/button.png")
The alias is "images/button.png". No extra QT_RESOURCE_ALIAS assignment
is needed.
The new behavior is in effect for user projects and for Qt repositories
that define QT_USE_FIXED_QT_ADD_RESOURCE_BASE. Qt repositories will be
ported one by one to this new behavior. Then the old code path can be
removed.
Pick-to: 6.1
Task-number: QTBUG-86726
Change-Id: Ib895edd4df8e97b54badadd9a1c34408beff131f
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
CMake Utils
This directory holds scripts to help the porting process from qmake to cmake for Qt6.
Requirements
- Python 3.7,
pipenvorpipto manage the modules.
Python modules
Since Python has many ways of handling projects, you have a couple of options to install the dependencies of the scripts:
Using pipenv
The dependencies are specified on the Pipfile, so you just need to run
pipenv install and that will automatically create a virtual environment
that you can activate with a pipenv shell.
Using pip
It's highly recommended to use a virtualenvironment
to avoid conflict with other packages that are already installed: pip install virtualenv.
- Create an environment:
virtualenv env, - Activate the environment:
source env/bin/activate(on Windows:source env\Scripts\activate.bat) - Install the requirements:
pip install -r requirements.txt
If the pip install command above doesn't work, try:
python3.7 -m pip install -r requirements.txt
Contributing to the scripts
You can verify if the styling of a script is compliant with PEP8, with a couple of exceptions:
Install flake8 (pip install flake8) and run it
on the script you want to test:
flake8 <file>.py --ignore=E501,E266,W503
E501: Line too long (82>79 characters),E266: Too many leading '#' for block comment,W503: Line break occurred before a binary operator)
You can also modify the file with an automatic formatter,
like black (pip install black),
and execute it:
black -l 100 <file>.py
Using Qt's maximum line length, 100.