D17015: Fix the Qt doc creation with Qt 5.12.

cgiboudeaux abandoned this revision. cgiboudeaux added a comment. qhelpgenerator is back in Qt 5.12.1 REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D17015 To: cgiboudeaux, kossebau Cc: thiago, tcberner, kde-frameworks-devel, kde-buildsystem, michaelh, ng

D17015: Fix the Qt doc creation with Qt 5.12.

thiago added a comment. qhelpgenerator is coming back in 5.12.1. You may simply tell people to skip the .0 release and upgrade. REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D17015 To: cgiboudeaux, kossebau Cc: thiago, tcberner, kde-frameworks-devel, kd

D17015: Fix the Qt doc creation with Qt 5.12.

cgiboudeaux updated this revision to Diff 47962. cgiboudeaux added a comment. Try to find qmake if qmake-qt5 is not found REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D17015?vs=46780&id=47962 BRANCH arcpatch-D17015 REVISION DETAIL https:/

D17015: Fix the Qt doc creation with Qt 5.12.

tcberner added inline comments. INLINE COMMENTS > ECMQueryQmake.cmake:9 > +# We need to look for the executable directly. > +find_program(_qmake_executable_default NAMES qmake-qt5) > endif() ^ on FreeBSD qmake-qt5 is just called qmake (which is in fact qtchooser). REPOSITORY R240 Ext

D17015: Fix the Qt doc creation with Qt 5.12.

cgiboudeaux added a comment. 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

D17015: Fix the Qt doc creation with Qt 5.12.

cgiboudeaux marked an inline comment as done. REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D17015 To: cgiboudeaux, kossebau Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D17015: Fix the Qt doc creation with Qt 5.12.

cgiboudeaux updated this revision to Diff 46780. cgiboudeaux added a comment. Add the reason for looking for the executable REPOSITORY R240 Extra CMake Modules CHANGES SINCE LAST UPDATE https://phabricator.kde.org/D17015?vs=45806&id=46780 BRANCH arcpatch-D17015 REVISION DETAIL https

D17015: Fix the Qt doc creation with Qt 5.12.

kossebau added a comment. 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,

D17015: Fix the Qt doc creation with Qt 5.12.

cgiboudeaux added a reviewer: kossebau. REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://phabricator.kde.org/D17015 To: cgiboudeaux, kossebau Cc: kde-frameworks-devel, kde-buildsystem, michaelh, ngraham, bruns

D17015: Fix the Qt doc creation with Qt 5.12.

cgiboudeaux added a comment. If anyone wonders: - These are 2 different commits for the same - Using find-modules/FindQHelpGenerator.cmake is not an option. Same reason as the one that made using query_qmake impossible. REPOSITORY R240 Extra CMake Modules REVISION DETAIL https://p

D17015: Fix the Qt doc creation with Qt 5.12.

cgiboudeaux created this revision. Herald added projects: Frameworks, Build System. Herald added subscribers: kde-buildsystem, kde-frameworks-devel. cgiboudeaux requested review of this revision. REVISION SUMMARY In Qt >= 5.12, the qhelpgenerator and qcollectiongenerator tools were fused, only