summaryrefslogtreecommitdiffstats
path: root/src/corelib
diff options
context:
space:
mode:
Diffstat (limited to 'src/corelib')
-rw-r--r--src/corelib/doc/src/objectmodel/signalsandslots.qdoc48
-rw-r--r--src/corelib/global/qglobal.cpp2
-rw-r--r--src/corelib/global/qnamespace.qdoc76
-rw-r--r--src/corelib/io/qprocess.cpp4
-rw-r--r--src/corelib/io/qprocess_unix.cpp12
-rw-r--r--src/corelib/io/qprocess_win.cpp14
-rw-r--r--src/corelib/kernel/qdeadlinetimer.cpp4
-rw-r--r--src/corelib/kernel/qobject.cpp3
-rw-r--r--src/corelib/serialization/qjson.cpp2
-rw-r--r--src/corelib/tools/qlocale.cpp12
-rw-r--r--src/corelib/tools/qlocale.qdoc4
-rw-r--r--src/corelib/tools/qstring.cpp4
-rw-r--r--src/corelib/tools/qstringlist.cpp8
13 files changed, 108 insertions, 85 deletions
diff --git a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc
index 0cbbef0502..213caa6c59 100644
--- a/src/corelib/doc/src/objectmodel/signalsandslots.qdoc
+++ b/src/corelib/doc/src/objectmodel/signalsandslots.qdoc
@@ -246,18 +246,20 @@
If you pass the Qt::UniqueConnection \a type, the connection will only
be made if it is not a duplicate. If there is already a duplicate
(exact same signal to the exact same slot on the same objects),
- the connection will fail and connect will return false
+ the connection will fail and connect will return \c false.
This example illustrates that objects can work together without needing to
know any information about each other. To enable this, the objects only
need to be connected together, and this can be achieved with some simple
- QObject::connect() function calls, or with \c{uic}'s
- \l{Automatic Connections}{automatic connections} feature.
+ QObject::connect() function calls, or with \l{User Interface Compiler
+ (uic)}{uic}'s \l{Automatic Connections}{automatic connections} feature.
\section1 A Real Example
- Here is a simple commented example of a widget.
+ The following is an example of the header of a simple widget class without
+ member functions. The purpose is to show how you can utilize signals and
+ slots in your own applications.
\snippet signalsandslots/lcdnumber.h 0
\snippet signalsandslots/lcdnumber.h 1
@@ -281,19 +283,13 @@
\snippet signalsandslots/lcdnumber.h 6
\snippet signalsandslots/lcdnumber.h 7
-
- It's not obviously relevant to the moc, but if you inherit
- QWidget you almost certainly want to have the \c parent argument
- in your constructor and pass it to the base class's constructor.
-
- Some destructors and member functions are omitted here; the \c
- moc ignores member functions.
-
+ \codeline
\snippet signalsandslots/lcdnumber.h 8
\snippet signalsandslots/lcdnumber.h 9
- \c LcdNumber emits a signal when it is asked to show an impossible
- value.
+ After the class constructor and \c public members, we declare the class
+ \c signals. The \c LcdNumber class emits a signal, \c overflow(), when it
+ is asked to show an impossible value.
If you don't care about overflow, or you know that overflow
cannot occur, you can ignore the \c overflow() signal, i.e. don't
@@ -325,8 +321,8 @@
callbacks, you'd have to find five different names and keep track
of the types yourself.
- Some irrelevant member functions have been omitted from this
- example.
+ \sa QLCDNumber, QObject::connect(), {Digital Clock Example}, and
+ {Tetrix Example}.
\section1 Signals And Slots With Default Arguments
@@ -361,18 +357,24 @@
You can also connect to functors or C++11 lambdas:
\code
- connect(sender, &QObject::destroyed, context, [=](){ this->m_objects.remove(sender); });
+ connect(sender, &QObject::destroyed, this, [=](){ this->m_objects.remove(sender); });
\endcode
- The lambda will be disconnected when the context is destroyed.
+ In both these cases, we provide \a this as context in the call to connect().
+ The context object provides information about in which thread the receiver
+ should be executed. This is important, as providing the context ensures
+ that the receiver is executed in the context thread.
+
+ The lambda will be disconnected when the sender or context is destroyed.
+ You should take care that any objects used inside the functor are still
+ alive when the signal is emitted.
The other way to connect a signal to a slot is to use QObject::connect()
and the \c{SIGNAL} and \c{SLOT} macros.
- The rule about whether to
- include arguments or not in the \c{SIGNAL()} and \c{SLOT()}
- macros, if the arguments have default values, is that the
- signature passed to the \c{SIGNAL()} macro must \e not have fewer
- arguments than the signature passed to the \c{SLOT()} macro.
+ The rule about whether to include arguments or not in the \c{SIGNAL()} and
+ \c{SLOT()} macros, if the arguments have default values, is that the
+ signature passed to the \c{SIGNAL()} macro must \e not have fewer arguments
+ than the signature passed to the \c{SLOT()} macro.
All of these would work:
\code
diff --git a/src/corelib/global/qglobal.cpp b/src/corelib/global/qglobal.cpp
index b52139d5a6..9cbfda3c2c 100644
--- a/src/corelib/global/qglobal.cpp
+++ b/src/corelib/global/qglobal.cpp
@@ -589,7 +589,7 @@ Q_STATIC_ASSERT((std::is_same<qsizetype, qptrdiff>::value));
{long long int } (\c __int64 on Windows).
Several convenience type definitions are declared: \l qreal for \c
- double, \l uchar for \c unsigned char, \l uint for \c unsigned
+ double or \c float, \l uchar for \c unsigned char, \l uint for \c unsigned
int, \l ulong for \c unsigned long and \l ushort for \c unsigned
short.
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 6bd72ff059..e3c51f4be0 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -116,8 +116,8 @@
\value AA_DontShowShortcutsInContextMenus Actions with the Shortcut property
won't be shown in any shortcut menus unless specifically set by the
- QAction::shortcutVisibleInContextMenu property. This value has
- been added in Qt 5.10.
+ QAction::shortcutVisibleInContextMenu property. This value was added
+ in Qt 5.10.
\value AA_NativeWindows Ensures that widgets have native windows.
@@ -132,9 +132,8 @@
menu and not taking possession of the native menu bar. Setting this
attribute to true will also set the AA_DontUseNativeMenuBar attribute
to true. It also disables native event filters.
- This attribute has been added in Qt 5.7. It must be set before
- \l {QGuiApplication}{Q\(Gui\)Application} is constructed.
-
+ This attribute must be set before QGuiApplication constructed.
+ This value was added in Qt 5.7.
\value AA_DontUseNativeMenuBar All menubars created while this attribute is
set to true won't be used as a native menubar (e.g, the menubar at
@@ -174,14 +173,14 @@
\value AA_UseDesktopOpenGL Forces the usage of desktop OpenGL (for example,
\e opengl32.dll or \e libGL.so) on platforms that use dynamic loading
- of the OpenGL implementation. This value has been added in Qt 5.3.
- This attribute must be set before \l {QGuiApplication}
- {Q\(Gui\)Application} is constructed.
+ of the OpenGL implementation. This attribute must be set before
+ QGuiApplication is constructed.
+ This value was added in Qt 5.3.
\value AA_UseOpenGLES Forces the usage of OpenGL ES 2.0 or higher on
platforms that use dynamic loading of the OpenGL implementation.
- This value has been added in Qt 5.3. This attribute must be set
- before \l {QGuiApplication}{Q\(Gui\)Application} is constructed.
+ This attribute must be set before QGuiApplication is constructed.
+ This value was added in Qt 5.3.
\value AA_UseSoftwareOpenGL Forces the usage of a software based OpenGL
implementation on platforms that use dynamic loading of the OpenGL
@@ -191,29 +190,28 @@
implementation is available. The default name of this library is
\c opengl32sw.dll and can be overridden by setting the environment
variable \e QT_OPENGL_DLL. See the platform-specific pages, for
- instance \l{Qt for Windows}, for more information. This value has
- been added in Qt 5.4. This attribute must be set before
- \l {QGuiApplication}{Q\(Gui\)Application} is constructed.
+ instance \l{Qt for Windows}, for more information. This attribute
+ must be set before QGuiApplication is constructed.
+ This value was added in Qt 5.4.
\value AA_ShareOpenGLContexts Enables resource sharing between the OpenGL
contexts used by classes like QOpenGLWidget and QQuickWidget. This
allows sharing OpenGL resources, like textures, between QOpenGLWidget
- instances that belong to different top-level windows. This value has
- been added in Qt 5.4. This attribute must be set before
- \l {QGuiApplication}{Q\(Gui\)Application} is constructed.
+ instances that belong to different top-level windows. This attribute
+ must be set before QGuiApplication is constructed.
+ This value was added in Qt 5.4.
\value AA_SetPalette Indicates whether a palette was explicitly set on the
- \l {QGuiApplication}{Q\(Gui\)Application}. This value has been added
- in Qt 5.5.
+ QGuiApplication. This value was added in Qt 5.5.
\value AA_EnableHighDpiScaling Enables high-DPI scaling in Qt on supported
platforms (see also \l{High DPI Displays}). Supported platforms are
X11, Windows and Android. Enabling makes Qt scale the main (device
independent) coordinate system according to display scale factors
provided by the operating system. This corresponds to setting the
- QT_AUTO_SCREEN\unicode{0x200b}_SCALE_FACTOR environment variable to 1. This value
- has been added in Qt 5.6. This attribute must be set before
- Q(Gui)Application is constructed.
+ QT_AUTO_SCREEN\unicode{0x200b}_SCALE_FACTOR environment variable to
+ 1. This attribute must be set before QGuiApplication is constructed.
+ This value was added in Qt 5.6.
\value AA_DisableHighDpiScaling Disables high-DPI scaling in Qt, exposing window
system coordinates. Note that the window system may do its own scaling,
@@ -221,24 +219,26 @@
be equal to 1. In addition, scale factors set by QT_SCALE_FACTOR will not
be affected. This corresponds to setting the
QT_AUTO_SCREEN\unicode{0x200b}_SCALE_FACTOR environment variable to 0.
- This value has been added in Qt 5.6. This
- attribute must be set before Q(Gui)Application is constructed.
+ This attribute must be set before QGuiApplication is constructed.
+ This value was added in Qt 5.6.
\value AA_UseStyleSheetPropagationInWidgetStyles By default, Qt Style Sheets
disable regular QWidget palette and font propagation. When this flag
is enabled, font and palette changes propagate as though the user had
manually called the corresponding QWidget methods. See
\l{The Style Sheet Syntax#Inheritance}{The Style Sheet Syntax - Inheritance}
- for more details. This value has been added in Qt 5.7.
+ for more details.
+ This value was added in Qt 5.7.
\value AA_DontUseNativeDialogs All dialogs created while this attribute is
set to true won't use the native dialogs provided by the platform.
- This value has been added in Qt 5.7.
+ This value was added in Qt 5.7.
\value AA_SynthesizeMouseForUnhandledTabletEvents All tablet events
that are not accepted by the application will be translated
to mouse events instead. This attribute is enabled
- by default. This value has been added in Qt 5.7.
+ by default.
+ This value was added in Qt 5.7.
\value AA_CompressHighFrequencyEvents Enables compression of certain frequent events.
On the X11 windowing system, the default value is true, which means that
@@ -251,19 +251,21 @@
If your application needs to handle all events with no compression,
you can unset this attribute. Notice that input events from tablet devices
will not be compressed. See AA_CompressTabletEvents if you want these to be
- compressed as well. This value has been added in Qt 5.7.
+ compressed as well.
+ This value was added in Qt 5.7.
\value AA_CompressTabletEvents Enables compression of input events from tablet devices.
Notice that AA_CompressHighFrequencyEvents must be true for events compression
to be enabled, and that this flag extends the former to tablet events. Its default
- value is false. This value has been added in Qt 5.10.
+ value is false.
+ This value was added in Qt 5.10.
\value AA_DontCheckOpenGLContextThreadAffinity When making a context
current using QOpenGLContext, do not check that the
\l{QObject#Thread Affinity}{QObject thread affinity}
of the QOpenGLContext object is the same thread calling
- \l{QOpenGLContext::makeCurrent}{makeCurrent()}. This value has been
- added in Qt 5.8.
+ \l{QOpenGLContext::makeCurrent}{makeCurrent()}.
+ This value was added in Qt 5.8.
\value AA_DisableShaderDiskCache Disables caching of shader program binaries
on disk. By default Qt Quick, QPainter's OpenGL backend, and any
@@ -277,7 +279,7 @@
\value AA_DisableWindowContextHelpButton Disables the WindowContextHelpButtonHint
by default on Qt::Sheet and Qt::Dialog widgets. This hides the \gui ? button
on Windows, which only makes sense if you use \l QWhatsThis functionality.
- This value has been added in Qt 5.10. For Qt 6, WindowContextHelpButtonHint
+ This value was added in Qt 5.10. In Qt 6, WindowContextHelpButtonHint
will not be set by default.
The following values are deprecated or obsolete:
@@ -2276,13 +2278,17 @@
correctly.
\value WindowStaysOnBottomHint Informs the window system that the
- window should stay on bottom of all other windows. Note
- that on X11 this hint will work only in window managers
+ window should stay on bottom of all other windows.
+
+ \note On X11, this hint will work only in window managers
that support _NET_WM_STATE_BELOW atom. If a window always
on the bottom has a parent, the parent will also be left on
the bottom. This window hint is currently not implemented
for \macos.
+ \note On Windows, this will work only for frameless or
+ full-screen windows.
+
\value WindowTransparentForInput Informs the window system that this window
is used only for output (displaying something) and does not take input.
Therefore input events should pass through as if it wasn't there.
@@ -2652,7 +2658,7 @@
but \b{must} not return an empty string unless the cursor is at the end of the document.
\value ImEnterKeyType The Enter key type.
\value ImAnchorRectangle The bounding rectangle of the selection anchor.
- This value has been added in Qt 5.7.
+ This value was added in Qt 5.7.
\value ImInputItemClipRectangle The actual exposed input item rectangle. Parts of the input item might be
clipped. This value will take clipping into consideration and return the actual painted
item rectangle. The rectangle is in widget coordinates.
@@ -2780,7 +2786,7 @@
\value ItemNeverHasChildren The item never has child items.
This is used for optimization purposes only.
\value ItemIsUserTristate The user can cycle through three separate states.
- This value has been added in Qt 5.5.
+ This value was added in Qt 5.5.
Note that checkable items need to be given both a suitable set of flags
and an initial state, indicating whether the item is checked or not.
diff --git a/src/corelib/io/qprocess.cpp b/src/corelib/io/qprocess.cpp
index 2ee680a7c6..890867cd51 100644
--- a/src/corelib/io/qprocess.cpp
+++ b/src/corelib/io/qprocess.cpp
@@ -2147,6 +2147,10 @@ void QProcess::start(OpenMode mode)
\endlist
All other properties of the QProcess object are ignored.
+ \note The called process inherits the console window of the calling
+ process. To suppress console output, redirect standard/error output to
+ QProcess::nullDevice().
+
\sa start()
\sa startDetached(const QString &program, const QStringList &arguments,
const QString &workingDirectory, qint64 *pid)
diff --git a/src/corelib/io/qprocess_unix.cpp b/src/corelib/io/qprocess_unix.cpp
index a849519635..713af9bd40 100644
--- a/src/corelib/io/qprocess_unix.cpp
+++ b/src/corelib/io/qprocess_unix.cpp
@@ -949,16 +949,14 @@ bool QProcessPrivate::startDetached(qint64 *pid)
qt_safe_close(pidPipe[1]);
// copy the stdin socket if asked to (without closing on exec)
- if (inputChannelMode != QProcess::ForwardedInputChannel)
+ if (stdinChannel.type == Channel::Redirect)
qt_safe_dup2(stdinChannel.pipe[0], STDIN_FILENO, 0);
// copy the stdout and stderr if asked to
- if (processChannelMode != QProcess::ForwardedChannels) {
- if (processChannelMode != QProcess::ForwardedOutputChannel)
- qt_safe_dup2(stdoutChannel.pipe[1], STDOUT_FILENO, 0);
- if (processChannelMode != QProcess::ForwardedErrorChannel)
- qt_safe_dup2(stderrChannel.pipe[1], STDERR_FILENO, 0);
- }
+ if (stdoutChannel.type == Channel::Redirect)
+ qt_safe_dup2(stdoutChannel.pipe[1], STDOUT_FILENO, 0);
+ if (stderrChannel.type == Channel::Redirect)
+ qt_safe_dup2(stderrChannel.pipe[1], STDERR_FILENO, 0);
if (!encodedWorkingDirectory.isEmpty()) {
if (QT_CHDIR(encodedWorkingDirectory.constData()) == -1)
diff --git a/src/corelib/io/qprocess_win.cpp b/src/corelib/io/qprocess_win.cpp
index 2e4b5d9cef..1f7a49379d 100644
--- a/src/corelib/io/qprocess_win.cpp
+++ b/src/corelib/io/qprocess_win.cpp
@@ -893,6 +893,11 @@ static bool startDetachedUacPrompt(const QString &programIn, const QStringList &
return true;
}
+static Q_PIPE pipeOrStdHandle(Q_PIPE pipe, DWORD handleNumber)
+{
+ return pipe != INVALID_Q_PIPE ? pipe : GetStdHandle(handleNumber);
+}
+
bool QProcessPrivate::startDetached(qint64 *pid)
{
static const DWORD errorElevationRequired = 740;
@@ -925,15 +930,14 @@ bool QProcessPrivate::startDetached(qint64 *pid)
0, 0, 0,
STARTF_USESTDHANDLES,
0, 0, 0,
- stdinChannel.pipe[0], stdoutChannel.pipe[1], stderrChannel.pipe[1]
+ pipeOrStdHandle(stdinChannel.pipe[0], STD_INPUT_HANDLE),
+ pipeOrStdHandle(stdoutChannel.pipe[1], STD_OUTPUT_HANDLE),
+ pipeOrStdHandle(stderrChannel.pipe[1], STD_ERROR_HANDLE)
};
- const bool inheritHandles = stdinChannel.type == Channel::Redirect
- || stdoutChannel.type == Channel::Redirect
- || stderrChannel.type == Channel::Redirect;
QProcess::CreateProcessArguments cpargs = {
nullptr, reinterpret_cast<wchar_t *>(const_cast<ushort *>(args.utf16())),
- nullptr, nullptr, inheritHandles, dwCreationFlags, envPtr,
+ nullptr, nullptr, true, dwCreationFlags, envPtr,
workingDirectory.isEmpty()
? nullptr : reinterpret_cast<const wchar_t *>(workingDirectory.utf16()),
&startupInfo, &pinfo
diff --git a/src/corelib/kernel/qdeadlinetimer.cpp b/src/corelib/kernel/qdeadlinetimer.cpp
index 4fba30050d..66d0dce7e8 100644
--- a/src/corelib/kernel/qdeadlinetimer.cpp
+++ b/src/corelib/kernel/qdeadlinetimer.cpp
@@ -223,7 +223,7 @@ QDeadlineTimer::QDeadlineTimer(qint64 msecs, Qt::TimerType type) Q_DECL_NOTHROW
Constructs a QDeadlineTimer object with a deadline at \a deadline time
point, converting from the clock source \c{Clock} to Qt's internal clock
- source (see QElapsedTimer::clcokType()).
+ source (see QElapsedTimer::clockType()).
If \a deadline is in the past, this QDeadlineTimer object is set to
expired, whereas if \a deadline is equal to \c{Duration::max()}, then this
@@ -266,7 +266,7 @@ QDeadlineTimer::QDeadlineTimer(qint64 msecs, Qt::TimerType type) Q_DECL_NOTHROW
Sets this QDeadlineTimer to the deadline marked by \a deadline time
point, converting from the clock source \c{Clock} to Qt's internal clock
- source (see QElapsedTimer::clcokType()).
+ source (see QElapsedTimer::clockType()).
If \a deadline is in the past, this QDeadlineTimer object is set to
expired, whereas if \a deadline is equal to \c{Duration::max()}, then this
diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp
index 974711e065..698ac256ff 100644
--- a/src/corelib/kernel/qobject.cpp
+++ b/src/corelib/kernel/qobject.cpp
@@ -3903,7 +3903,8 @@ bool QObject::setProperty(const char *name, const QVariant &value)
d->extraData->propertyNames.append(name);
d->extraData->propertyValues.append(value);
} else {
- if (value == d->extraData->propertyValues.at(idx))
+ if (value.userType() == d->extraData->propertyValues.at(idx).userType()
+ && value == d->extraData->propertyValues.at(idx))
return false;
d->extraData->propertyValues[idx] = value;
}
diff --git a/src/corelib/serialization/qjson.cpp b/src/corelib/serialization/qjson.cpp
index 7912b5040c..b82923fe0c 100644
--- a/src/corelib/serialization/qjson.cpp
+++ b/src/corelib/serialization/qjson.cpp
@@ -46,7 +46,7 @@ namespace QJsonPrivate
{
static Q_CONSTEXPR Base emptyArray = { { qle_uint(sizeof(Base)) }, { 0 }, { qle_uint(0) } };
-static Q_CONSTEXPR Base emptyObject = { { qle_uint(sizeof(Base)) }, { 0 }, { qle_uint(0) } };
+static Q_CONSTEXPR Base emptyObject = { { qle_uint(sizeof(Base)) }, { qToLittleEndian(1u) }, { qle_uint(0) } };
void Data::compact()
{
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index 7341d196cb..24fd597e52 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -1791,6 +1791,8 @@ QString QLocale::toString(qulonglong i) const
Returns a localized string representation of the given \a date in the
specified \a format.
If \a format is an empty string, an empty string is returned.
+
+ \sa QDate::toString()
*/
QString QLocale::toString(const QDate &date, const QString &format) const
@@ -1805,6 +1807,8 @@ QString QLocale::toString(const QDate &date, const QString &format) const
Returns a localized string representation of the given \a date in the
specified \a format.
If \a format is an empty string, an empty string is returned.
+
+ \sa QDate::toString()
*/
QString QLocale::toString(const QDate &date, QStringView format) const
{
@@ -1857,6 +1861,8 @@ static bool timeFormatContainsAP(QStringView format)
Returns a localized string representation of the given \a time according
to the specified \a format.
If \a format is an empty string, an empty string is returned.
+
+ \sa QTime::toString()
*/
QString QLocale::toString(const QTime &time, const QString &format) const
{
@@ -1870,6 +1876,8 @@ QString QLocale::toString(const QTime &time, const QString &format) const
Returns a localized string representation of the given \a time according
to the specified \a format.
If \a format is an empty string, an empty string is returned.
+
+ \sa QTime::toString()
*/
QString QLocale::toString(const QTime &time, QStringView format) const
{
@@ -1883,6 +1891,8 @@ QString QLocale::toString(const QTime &time, QStringView format) const
Returns a localized string representation of the given \a dateTime according
to the specified \a format.
If \a format is an empty string, an empty string is returned.
+
+ \sa QDateTime::toString(), QDate::toString(), QTime::toString()
*/
QString QLocale::toString(const QDateTime &dateTime, const QString &format) const
@@ -1897,6 +1907,8 @@ QString QLocale::toString(const QDateTime &dateTime, const QString &format) cons
Returns a localized string representation of the given \a dateTime according
to the specified \a format.
If \a format is an empty string, an empty string is returned.
+
+ \sa QDateTime::toString(), QDate::toString(), QTime::toString()
*/
QString QLocale::toString(const QDateTime &dateTime, QStringView format) const
{
diff --git a/src/corelib/tools/qlocale.qdoc b/src/corelib/tools/qlocale.qdoc
index 131552b7b7..bbb13bd165 100644
--- a/src/corelib/tools/qlocale.qdoc
+++ b/src/corelib/tools/qlocale.qdoc
@@ -939,6 +939,8 @@
locale doesn't support narrow names, so you should avoid using it
for date formatting. Also, for the system locale this format is
the same as ShortFormat.
+
+ \sa QDateTime::toString(), QDate::toString(), QTime::toString()
*/
/*!
@@ -1103,6 +1105,8 @@
\value ListToSeparatedString a string that represents a join of a given QStringList with a locale-defined separator.
\value NativeLanguageName a string that represents the name of the native language.
\value NativeCountryName a string that represents the name of the native country.
+
+ \sa FormatType
*/
/*!
diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp
index ec274d8abf..1c8e47267d 100644
--- a/src/corelib/tools/qstring.cpp
+++ b/src/corelib/tools/qstring.cpp
@@ -7388,7 +7388,7 @@ ushort QString::toUShort(bool *ok, int base) const
\snippet qstring/main.cpp 66
\warning The QString content may only contain valid numerical characters
- which includes the plus/minus sign, the characters g and e used in scientific
+ which includes the plus/minus sign, the character e used in scientific
notation, and the decimal point. Including the unit or additional characters
leads to a conversion error.
@@ -7424,7 +7424,7 @@ double QString::toDouble(bool *ok) const
to \c false, and success by setting *\a{ok} to \c true.
\warning The QString content may only contain valid numerical characters
- which includes the plus/minus sign, the characters g and e used in scientific
+ which includes the plus/minus sign, the character e used in scientific
notation, and the decimal point. Including the unit or additional characters
leads to a conversion error.
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp
index c9db39a29f..e9b7397a74 100644
--- a/src/corelib/tools/qstringlist.cpp
+++ b/src/corelib/tools/qstringlist.cpp
@@ -611,8 +611,6 @@ static int lastIndexOfMutating(const QStringList *that, QRegExp &rx, int from)
the list, searching forward from index position \a from. Returns
-1 if no item matched.
- By default, this function is case sensitive.
-
\sa lastIndexOf(), contains(), QRegExp::exactMatch()
*/
int QtPrivate::QStringList_indexOf(const QStringList *that, const QRegExp &rx, int from)
@@ -630,8 +628,6 @@ int QtPrivate::QStringList_indexOf(const QStringList *that, const QRegExp &rx, i
the list, searching forward from index position \a from. Returns
-1 if no item matched.
- By default, this function is case sensitive.
-
If an item matched, the \a rx regular expression will contain the
matched objects (see QRegExp::matchedLength, QRegExp::cap).
@@ -650,8 +646,6 @@ int QtPrivate::QStringList_indexOf(const QStringList *that, QRegExp &rx, int fro
from is -1 (the default), the search starts at the last item.
Returns -1 if no item matched.
- By default, this function is case sensitive.
-
\sa indexOf(), contains(), QRegExp::exactMatch()
*/
int QtPrivate::QStringList_lastIndexOf(const QStringList *that, const QRegExp &rx, int from)
@@ -670,8 +664,6 @@ int QtPrivate::QStringList_lastIndexOf(const QStringList *that, const QRegExp &r
from is -1 (the default), the search starts at the last item.
Returns -1 if no item matched.
- By default, this function is case sensitive.
-
If an item matched, the \a rx regular expression will contain the
matched objects (see QRegExp::matchedLength, QRegExp::cap).
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 23:03:54 +0000