From e7763d972a4404b283260d29ebf7720a981349cb Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Sun, 5 Mar 2023 17:35:03 +0300 Subject: cmake: Find qdoc directly instead of relying on qmake path Qt6ToolsToolsTargets.cmake provides a Qt6::qdoc target, so there is no need to guess qdoc path based on qmake path. It is the same file where Qt6::qhelpgenerator is defined, which we use here too. This fixes build on Debian where we moved Qt6::qmake into a different path to help with cross-building, leaving Qt6::qdoc where it was. Change-Id: I9e66ffafc8aeb18edc1fe2b27608caa4ee90c3f7 Reviewed-by: Ivan Komissarov --- cmake/QbsDocumentation.cmake | 22 +++------------------- 1 file changed, 3 insertions(+), 19 deletions(-) diff --git a/cmake/QbsDocumentation.cmake b/cmake/QbsDocumentation.cmake index c8c1635e7..bdcec664f 100644 --- a/cmake/QbsDocumentation.cmake +++ b/cmake/QbsDocumentation.cmake @@ -40,23 +40,6 @@ function(qt_query_qmake) endforeach() endfunction() -# Find programs: -function(_qbs_doc_find_program result_var) - if (NOT TARGET Qt${QT_VERSION_MAJOR}::qmake) - message(FATAL_ERROR "QDoc is only available in Qt projects") - endif() - - get_target_property(_qmake_binary Qt${QT_VERSION_MAJOR}::qmake IMPORTED_LOCATION) - get_filename_component(_qmake_dir "${_qmake_binary}" DIRECTORY) - find_program("_prg_${result_var}" ${ARGN} HINTS "${_qmake_dir}") - if ("_prg_${result_var}" STREQUAL "_prg_${result_var}-NOTFOUND") - set("_prg_${result_var}" "${result_var}-NOTFOUND") - message(WARNING "Could not find binary for ${result_var}") - endif() - - set(${result_var} "${_prg_${result_var}}" PARENT_SCOPE) -endfunction() - function(_qbs_setup_doc_targets) # Set up important targets: if (NOT TARGET qbs_html_docs) @@ -114,6 +97,8 @@ function(_qbs_setup_qdoc_targets _qdocconf_file _retval) list(APPEND _env "${_export}=${${_export}}") endforeach() + get_target_property(_qdoc Qt${QT_VERSION_MAJOR}::qdoc IMPORTED_LOCATION) + set(_full_qdoc_command "${_qdoc}") if (_env) set(_full_qdoc_command "${CMAKE_COMMAND}" "-E" "env" ${_env} "${_qdoc}") @@ -246,8 +231,7 @@ endfunction() function(_qbs_qdoc_build_qdocconf_file _qdocconf_file) _qbs_setup_doc_targets() - _qbs_doc_find_program(_qdoc NAMES qdoc qdoc-qt5) - if (_qdoc STREQUAL "_prg__qdoc-NOTFOUND") + if (NOT TARGET Qt${QT_VERSION_MAJOR}::qdoc) message(WARNING "No qdoc binary found: No documentation targets were generated") return() endif() -- cgit v1.2.3 From 3115f086efef4aebbb1f014bc685389b80893bb7 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 6 Mar 2023 17:03:28 +0100 Subject: Tests: Upgrade the grpc test app to C++14 As requested by our macOS CI machines. Change-Id: Ic5ef011585bf89da1f04162a26682308b9291c38 Reviewed-by: Ivan Komissarov --- tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs index 6f5360ccb..a7debfa07 100644 --- a/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs +++ b/tests/auto/blackbox/testdata/grpc/grpc_cpp.qbs @@ -11,7 +11,7 @@ CppApplication { } Depends { name: "cpp" } - cpp.cxxLanguageVersion: "c++11" + cpp.cxxLanguageVersion: "c++14" cpp.minimumMacosVersion: "10.8" cpp.warningLevel: "none" -- cgit v1.2.3 From 33d129352a2674fdc8fc8c26b826a78f10e5f7a6 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 9 Mar 2023 13:20:20 +0100 Subject: freedesktop: Rename "name" property to "appName" "name" is a built-in property of the Module item that must not be set by users. Astonishingly, this has worked so far due to the way the ModuleLoader code was written. Change-Id: I959bc0bba6b7c17a420fc6201031ab0bf4449292 Reviewed-by: Ivan Komissarov --- changelogs/changes-2.0.0.md | 3 +++ doc/reference/modules/freedesktop-module.qdoc | 2 +- share/qbs/modules/freedesktop/FreeDesktop.qbs | 3 ++- tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/changelogs/changes-2.0.0.md b/changelogs/changes-2.0.0.md index 93a37ae7f..14cacb761 100644 --- a/changelogs/changes-2.0.0.md +++ b/changelogs/changes-2.0.0.md @@ -9,6 +9,9 @@ # BareMetal support * Added support for HPPA architectures +# Other modules +* Renamed "name" to "appName" in the freedesktop module to prevent clash with built-in property + # Infrastructure * Added USBSAN CI job diff --git a/doc/reference/modules/freedesktop-module.qdoc b/doc/reference/modules/freedesktop-module.qdoc index 6c9d4a7fa..5b6b14d0f 100644 --- a/doc/reference/modules/freedesktop-module.qdoc +++ b/doc/reference/modules/freedesktop-module.qdoc @@ -119,7 +119,7 @@ */ /*! - \qmlproperty string freedesktop::name + \qmlproperty string freedesktop::appName The display name of the application which will be stored in the \c{.desktop} file. diff --git a/share/qbs/modules/freedesktop/FreeDesktop.qbs b/share/qbs/modules/freedesktop/FreeDesktop.qbs index 5fe7ed72c..60722c674 100644 --- a/share/qbs/modules/freedesktop/FreeDesktop.qbs +++ b/share/qbs/modules/freedesktop/FreeDesktop.qbs @@ -34,13 +34,14 @@ import "freedesktop.js" as Fdo Module { property string name: product.name + property string appName: name property var desktopKeys readonly property var defaultDesktopKeys: { return { 'Type': 'Application', - 'Name': product.freedesktop.name, + 'Name': product.freedesktop.appName, 'Exec': product.targetName, 'Terminal': 'false', 'Version': '1.1', diff --git a/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs b/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs index b3519ba4c..1efe5c91c 100644 --- a/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs +++ b/tests/auto/blackbox/testdata/freedesktop/freedesktop.qbs @@ -10,7 +10,7 @@ Project { Depends { name: "freedesktop" } - freedesktop.name: "My App" + freedesktop.appName: "My App" freedesktop.desktopKeys: ({ 'Icon': "myapp.png" }) -- cgit v1.2.3