diff options
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qcommandlineparser.cpp | 8 | ||||
| -rw-r--r-- | src/corelib/tools/qlocale_mac.mm | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/src/corelib/tools/qcommandlineparser.cpp b/src/corelib/tools/qcommandlineparser.cpp index 2fe957d873..117ce381f1 100644 --- a/src/corelib/tools/qcommandlineparser.cpp +++ b/src/corelib/tools/qcommandlineparser.cpp @@ -331,11 +331,13 @@ bool QCommandLineParser::addOption(const QCommandLineOption &option) /*! \since 5.4 - Adds the options \a options to look for while parsing. + Adds the options to look for while parsing. The options are specified by + the parameter \a options. - Returns \c false if adding any of the options failed; otherwise returns \c false. + Returns \c true if adding all of the options was successful; otherwise + returns \c false. - Cf. addOption() for when it may fail. + See the documentation for addOption() for when this function may fail. */ bool QCommandLineParser::addOptions(const QList<QCommandLineOption> &options) { diff --git a/src/corelib/tools/qlocale_mac.mm b/src/corelib/tools/qlocale_mac.mm index 92dfba162c..612d1e7e15 100644 --- a/src/corelib/tools/qlocale_mac.mm +++ b/src/corelib/tools/qlocale_mac.mm @@ -502,7 +502,7 @@ QVariant QSystemLocale::query(QueryType type, QVariant in = QVariant()) const } else if (typeId == CFStringGetTypeID()) { result = QStringList(QCFString::toQString(languages.as<CFStringRef>())); } else { - qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%s\"; please report to http://bugreports.qt-project.org", + qWarning("QLocale::uiLanguages(): CFPreferencesCopyValue returned unhandled type \"%s\"; please report to http://bugreports.qt.io", qPrintable(QCFString::toQString(CFCopyTypeIDDescription(typeId)))); } return QVariant(result); |