diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-05 17:58:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-05 18:02:18 +0100 |
| commit | a7e4b645dc5b164eb31c22b558ae7a2f5b674afb (patch) | |
| tree | c58ac922346363c265ad6873cefe9ed205d84a1d /src/corelib/doc/snippets/qstring/main.cpp | |
| parent | cd542a82b0c2d5c9a4ea167a84e5ea8a25c5d969 (diff) | |
| parent | ea0e868c4881944207e9b3a77011e05a505ff3b7 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
src/corelib/global/minimum-linux.S
src/network/access/qhttpthreaddelegate.cpp
src/widgets/kernel/qwidgetwindow.cpp
Change-Id: Id2e817e85f85c68f5482c9a12912d35590f9d5f8
Diffstat (limited to 'src/corelib/doc/snippets/qstring/main.cpp')
| -rw-r--r-- | src/corelib/doc/snippets/qstring/main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/corelib/doc/snippets/qstring/main.cpp b/src/corelib/doc/snippets/qstring/main.cpp index f740888fe7..3d09e3618e 100644 --- a/src/corelib/doc/snippets/qstring/main.cpp +++ b/src/corelib/doc/snippets/qstring/main.cpp @@ -333,11 +333,11 @@ void Widget::compareSensitiveFunction() int z = QString::compare("auto", "Car", Qt::CaseInsensitive); // z < 0 //! [16] - //! [qCompareStrings-QSV-QSV] - int x = qCompareStrings(u"aUtO", u"AuTo", Qt::CaseInsensitive); // x == 0 - int y = qCompareStrings(u"auto", u"Car", Qt::CaseSensitive); // y > 0 - int z = qCompareStrings(u"auto", u"Car", Qt::CaseInsensitive); // z < 0 - //! [qCompareStrings-QSV-QSV] + //! [QtPrivate::compareStrings-QSV-QSV] + int x = QtPrivate::compareStrings(u"aUtO", u"AuTo", Qt::CaseInsensitive); // x == 0 + int y = QtPrivate::compareStrings(u"auto", u"Car", Qt::CaseSensitive); // y > 0 + int z = QtPrivate::compareStrings(u"auto", u"Car", Qt::CaseInsensitive); // z < 0 + //! [QtPrivate::compareStrings-QSV-QSV] } void Widget::containsFunction() |