[Development] Heads up: Merge of qtbase/wip/cmake to qtbase/dev soon

[Alexandru Croitor]

Another important PSA.

Developers that modify .pro / .pri / .qrc / configure.json files in 5.14 / 5.15, your changes will be merged upwards all the way to dev (this is business as usual at the moment).

That means that the 5.15 -> dev merge might fail, due to the CMakeLists.txt files not being adapted for the propagating .pro / .pri changes.

In such a case, please make sure to help the person shepherding the merge, by regenerating the project files using the pro2cmake script.

You can checkout the merge locally and run a command like

git diff --stat=300 HEAD^..HEAD | ag "\.(pr(o|i))|json|qrc"

which will give you the list of modified .pro / .pri / configure.json / .qrc files.

You can then run 

python3 qtbase/util/cmake/pro2cmake.py ./path/to/the/project.pro

on the particular changes that you did. Then modify / adapt the output.

And then either push the modified merge to Gerrit if you have merge rights, or provide a diff for the person handling merge.

Thanks.

> On 11. Feb 2020, at 16:17, Alexandru Croitor <alexandru.croitor at qt.io> wrote:
> 
> Hi,
> 
> Short PSA.
> 
> The merge of wip/cmake to dev is done.
> 
> I'm enabling enforcing CMake builds in dev branch. CMake build phase will have to pass , tests can still fail and it won't fail integrations.
> 
> In case some build system .pro change sneaks in between the merge and the enabling of enforcing CMake Coin, all dev integrations will fail for a bit. I'll fix that up. 
> 
> But afterwards, regeneration of the CMake projects will be the responsibility of the person changing the .pro / .pri / .qrc / configure.json file.
> If you don't know how to do that, you can come to freenode #qt-cmake for help.
> 
> 
> Just in case:
> 
> README is at: https://github.com/qt/qtbase/tree/wip/cmake/cmake
> Guide is at: https://wiki.qt.io/CMake_Port/Porting_Guide
> 
> 
> Regards,
> 
> Alexandru.
> 
>> On 3. Feb 2020, at 14:52, Alexandru Croitor <alexandru.croitor at qt.io> wrote:
>> 
>> Hi,
>> 
>> The Qt CMake Port team would like to merge the wip/cmake branch of qtbase to dev, soon™ (this week or next week).
>> 
>> This is mostly a heads up email, so that it doesn't come as a total surprise.
>> 
>> How this affects people:
>> 
>> 1) The qmake Coin builds are still there and continue to work.
>> 
>> 2) Soon after the merge, a qt5.git change will land which will add a few more qtbase Coin configurations which will build qtbase with CMake.
>> 
>> 3) If these CMake Coin builds fail, developers of the respective changes will have to adapt their changes to fix the CMake builds.
>> 
>> 3.1) Most of these fixes can probably be done automatically by running the magical pro2cmake.py script on the build system parts you changed.
>> 
>> 4) The CMake port in not yet complete.
>> 
>> 4.1) Not all tests are passing the test phase yet, that's why Coin ignores test phase errors and will always say that test phase passed successfully. The important part is that tests *build* successfully.
>> 
>> 
>> Preliminary tests showed that nothing breaks in Coin as a result of the merge.
>> 
>> 
>> The current merge diff is at:
>> https://codereview.qt-project.org/c/qt/qtbase/+/282101
>> 
>> README is at: https://github.com/qt/qtbase/tree/wip/cmake/cmake
>> Guide is at: https://wiki.qt.io/CMake_Port/Porting_Guide
>> 
>> Regards,
>> Alexandru.
> 
> _______________________________________________
> Development mailing list
> Development at qt-project.org
> https://lists.qt-project.org/listinfo/development