Differential D17015

Fix the Qt doc creation with Qt 5.12.
AbandonedPublic
Actions

Authored by krop on Nov 19 2018, 1:33 PM.

Details

Reviewers

kossebau

Summary

In Qt >= 5.12, the qhelpgenerator and qcollectiongenerator tools were fused, only qhelpgenerator remains.

Allow using ECMQueryQmake inside ECM.

Due to project(ECM) specifying the "NONE" language, find_package(Qt5Core)
cannot succeed.

if the Qt5::qmake target doesn't exist, we now look for the qmake executable.

Diff Detail

Repository

R240 Extra CMake Modules

Branch

arcpatch-D17015

Lint

No Linters Available

Unit

No Unit Test Coverage

Build Status

Buildable 6241
Build 6259: arc lint + arc unit

krop created this revision.Nov 19 2018, 1:33 PM

Restricted Application added projects: Frameworks, Build System. · View Herald TranscriptNov 19 2018, 1:33 PM

Restricted Application added subscribers: kde-buildsystem, kde-frameworks-devel. · View Herald Transcript

krop requested review of this revision.Nov 19 2018, 1:33 PM

Harbormaster completed remote builds in B5135: Diff 45806.Nov 19 2018, 1:33 PM

If anyone wonders:

These are 2 different commits for the same issue
Using find-modules/FindQHelpGenerator.cmake is not an option. Same reason as the one that made using query_qmake impossible.

krop added a reviewer: kossebau.Nov 20 2018, 12:29 PM

Good to see you caring for ECM documentation not getting broken with Qt 5.12 :)

Any idea how we could perhaps deduplicate the FindQHelpGenerator.cmake with the one from find-modules (which is a helper for runtime with the ECMAddQch macro)? No instant idea yet, perhaps also better to have dedicated variants for each purppse? Needs me another round of thinking.

modules/ECMQueryQmake.cmake
6	Perhaps worth to add a comment describing all known scenarios why we reach the else branch. The version with find_package(Qt5Core) failing due to NONE language would be not on my radar, thus nice to have it listed here for future code readers.

Add the reason for looking for the executable

Harbormaster completed remote builds in B5667: Diff 46780.Dec 3 2018, 11:40 AM

krop marked an inline comment as done.Dec 3 2018, 11:41 AM

In D17015#363060, @kossebau wrote:

Good to see you caring for ECM documentation not getting broken with Qt 5.12 :)

Any idea how we could perhaps deduplicate the FindQHelpGenerator.cmake with the one from find-modules (which is a helper for runtime with the ECMAddQch macro)? No instant idea yet, perhaps also better to have dedicated variants for each purppse? Needs me another round of thinking.

FindQCollectionGenerator.cmake can be deprecated and replaced by a FindXXX.cmake (name to define) module that looks for qhelpgenerator or qcollectiongenerator. IMO not worth the effort, FindQCollectionGenerator.cmake will be removed in KF6

tcberner added a subscriber: tcberner.Dec 6 2018, 7:40 PM

tcberner added inline comments.

modules/ECMQueryQmake.cmake
9	^ on FreeBSD qmake-qt5 is just called qmake (which is in fact qtchooser).

Try to find qmake if qmake-qt5 is not found

Harbormaster completed remote builds in B6241: Diff 47962.Dec 21 2018, 2:57 PM

qhelpgenerator is coming back in 5.12.1. You may simply tell people to skip the .0 release and upgrade.

qhelpgenerator is back in Qt 5.12.1

Revision Contents
Changeset List

		Path
A	M	cmake/FindQHelpGenerator.cmake (93 lines)
M		docs/CMakeLists.txt (47 lines)
M		modules/ECMQueryQmake.cmake (9 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	45806	96d169b		Nov 19 2018, 1:33 PM	★	★
Diff 2	46780	96d169b	Add the reason for looking for the executable	Dec 3 2018, 11:40 AM	★	★
Diff 3	47962	96d169b	Try to find qmake if qmake-qt5 is not found	Dec 21 2018, 2:57 PM	★	★