1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix assorted misindented end-comment markers in qglobal.cpp

Browse Source 
Change-Id: I240e7d32c4aa004f2bd7dd8cafd39b7c7d64e014
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Venugopal Shivashankar <Venugopal.Shivashankar@qt.io>
This commit is contained in:
Edward Welbourne 2021-09-17 16:33:03 +02:00
parent 44028a227e
commit c608bdfb25
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/corelib/global/qglobal.cpp
View File

@ -1434,42 +1434,42 @@ bool qSharedBuild() noexcept
\relates <QtGlobal> \relates <QtGlobal>
Deprecated synonym for \c Q_OS_DARWIN. Do not use. Deprecated synonym for \c Q_OS_DARWIN. Do not use.
*/ */
/*! /*!
\macro Q_OS_OSX \macro Q_OS_OSX
\relates <QtGlobal> \relates <QtGlobal>
Deprecated synonym for \c Q_OS_MACOS. Do not use. Deprecated synonym for \c Q_OS_MACOS. Do not use.
*/ */
/*! /*!
\macro Q_OS_MACOS \macro Q_OS_MACOS
\relates <QtGlobal> \relates <QtGlobal>
Defined on \macos. Defined on \macos.
*/ */
/*! /*!
\macro Q_OS_IOS \macro Q_OS_IOS
\relates <QtGlobal> \relates <QtGlobal>
Defined on iOS. Defined on iOS.
*/ */
/*! /*!
\macro Q_OS_WATCHOS \macro Q_OS_WATCHOS
\relates <QtGlobal> \relates <QtGlobal>
Defined on watchOS. Defined on watchOS.
*/ */
/*! /*!
\macro Q_OS_TVOS \macro Q_OS_TVOS
\relates <QtGlobal> \relates <QtGlobal>
Defined on tvOS. Defined on tvOS.
*/ */
/*! /*!
\macro Q_OS_WIN \macro Q_OS_WIN
@ -2082,7 +2082,7 @@ bool qSharedBuild() noexcept
the ones deprecated in Qt 5.0. the ones deprecated in Qt 5.0.
\sa QT_DEPRECATED_WARNINGS \sa QT_DEPRECATED_WARNINGS
*/ */
/*! /*!
@ -2094,7 +2094,7 @@ bool qSharedBuild() noexcept
deprecated by Qt is used. deprecated by Qt is used.
\sa QT_DISABLE_DEPRECATED_BEFORE, QT_NO_DEPRECATED_WARNINGS \sa QT_DISABLE_DEPRECATED_BEFORE, QT_NO_DEPRECATED_WARNINGS
*/ */
/*! /*!
\macro QT_NO_DEPRECATED_WARNINGS \macro QT_NO_DEPRECATED_WARNINGS
@ -2449,7 +2449,7 @@ Marshmallow
Nougat Nougat
Nougat Nougat
Oreo Oreo
*/ */
static const char versions_string[] = static const char versions_string[] =
"\0" "\0"
"Cupcake\0" "Cupcake\0"
@ -2549,7 +2549,7 @@ QString QSysInfo::buildCpuArchitecture()
\endlist \endlist
\sa QSysInfo::buildAbi(), QSysInfo::buildCpuArchitecture() \sa QSysInfo::buildAbi(), QSysInfo::buildCpuArchitecture()
*/ */
QString QSysInfo::currentCpuArchitecture() QString QSysInfo::currentCpuArchitecture()
{ {
#if defined(Q_OS_WIN) #if defined(Q_OS_WIN)
@ -2935,7 +2935,7 @@ QString QSysInfo::prettyProductName()
This function returns the same as QHostInfo::localHostName(). This function returns the same as QHostInfo::localHostName().
\sa QHostInfo::localDomainName, machineUniqueId() \sa QHostInfo::localDomainName, machineUniqueId()
*/ */
QString QSysInfo::machineHostName() QString QSysInfo::machineHostName()
{ {
// the hostname can change, so we can't cache it // the hostname can change, so we can't cache it
@ -3242,7 +3242,7 @@ QByteArray QSysInfo::bootUniqueId()
\tt{const TInputType& myMin(const TInputType&, const TInputType&) [with TInputType = int] was called with value1: 3 value2: 4} \tt{const TInputType& myMin(const TInputType&, const TInputType&) [with TInputType = int] was called with value1: 3 value2: 4}
If this macro is used outside a function, the behavior is undefined. If this macro is used outside a function, the behavior is undefined.
*/ */
/*! /*!
\internal \internal
@ -4429,7 +4429,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
The two numbers are compared in a relative way, where the The two numbers are compared in a relative way, where the
exactness is stronger the smaller the numbers are. exactness is stronger the smaller the numbers are.
*/ */
/*! /*!
\fn bool qFuzzyCompare(float p1, float p2) \fn bool qFuzzyCompare(float p1, float p2)
@ -4442,7 +4442,7 @@ bool QInternal::activateCallbacks(Callback cb, void **parameters)
The two numbers are compared in a relative way, where the The two numbers are compared in a relative way, where the
exactness is stronger the smaller the numbers are. exactness is stronger the smaller the numbers are.
*/ */
/*! /*!
\fn bool qFuzzyIsNull(double d) \fn bool qFuzzyIsNull(double d)