summaryrefslogtreecommitdiffstats
path: root/src/libs/installer/systeminfo.cpp
diff options
context:
space:
mode:
authorTopi Reinio <topi.reinio@qt.io>2023-11-28 14:45:30 +0000
committerTopi Reiniƶ <topi.reinio@qt.io>2023-12-08 10:56:56 +0000
commit1fda6109c0c302d3b2d2ccb05802391e421e64d6 (patch)
tree3f72e68893834a8d6cdb8b3282683cab996aa0af /src/libs/installer/systeminfo.cpp
parent8e70a8a7287f773d9d181d2d39363328e5c0a4de (diff)
Doc: Fix documentation build configuration
The custom qmake documentation build target did not correctly locate private include paths for Qt modules. Fix this by replacing dashes with underscores (e.g. qtcore-private -> qtcore_private) before querying the paths. Remove duplicate entry for qtcore-private (it's already added at top level). In ifw.qdocconf, fix relative additional include paths. Remove all non-existent paths from the configuration. Use the correct URL for the online documentation. Remove the now-obsolete custom module header, and let QDoc build an artificial one based on 'headerdirs'. In passing, fix minor issues in the documentation sources. Change-Id: I5cdbd64307448014fa8b73a70378627fdb89b942 Reviewed-by: Katja Marttila <katja.marttila@qt.io>
Diffstat (limited to 'src/libs/installer/systeminfo.cpp')
-rw-r--r--src/libs/installer/systeminfo.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libs/installer/systeminfo.cpp b/src/libs/installer/systeminfo.cpp
index 0b9b00500..3859382b4 100644
--- a/src/libs/installer/systeminfo.cpp
+++ b/src/libs/installer/systeminfo.cpp
@@ -63,7 +63,7 @@ SystemInfo::SystemInfo(QObject *parent) : QObject(parent)
OS running on a 64-bit CPU is usually unable to determine whether the CPU is actually capable
of running 64-bit programs.
- \sa QSysInfo::currentCpuArchitecture() \sa buildCpuArchitecture()
+ \sa QSysInfo::currentCpuArchitecture() buildCpuArchitecture()
*/
QString SystemInfo::currentCpuArchitecture() const
{
@@ -86,7 +86,7 @@ QString SystemInfo::currentCpuArchitecture() const
there's an emulation layer or if the CPU supports multiple architectures (like x86-64
processors supporting i386 applications). To detect that, use \c installer.currentCpuArchitecture()
- \sa QSysInfo::buildCpuArchitecture() \sa currentCpuArchitecture()
+ \sa QSysInfo::buildCpuArchitecture() currentCpuArchitecture()
*/
QString SystemInfo::buildCpuArchitecture() const
{