mirror of https://github.com/qt/qtdoc.git
Replace uses of deprecated _qs with _s
Task-number: QTBUG-101408 Change-Id: I011d5ed352298902158d0b1b89ad3b99b310fc83 Reviewed-by: Marc Mutz <marc.mutz@qt.io>
This commit is contained in:
parent
4e7f9f6006
commit
bd53f014a0
|
@ -48,6 +48,8 @@
|
|||
**
|
||||
****************************************************************************/
|
||||
|
||||
using namespace Qt::StringLiterals;
|
||||
|
||||
//! [0]
|
||||
LoginWidget::LoginWidget()
|
||||
{
|
||||
|
@ -130,7 +132,7 @@ int main(int argc, char *argv[])
|
|||
QApplication app(argc, argv);
|
||||
|
||||
QTranslator myappTranslator;
|
||||
if (myappTranslator.load(QLocale::system(), u"myapp"_qs, u"_"_qs, u":/i18n"_qs))
|
||||
if (myappTranslator.load(QLocale::system(), u"myapp"_s, u"_"_s, u":/i18n"_s))
|
||||
app.installTranslator(&myappTranslator);
|
||||
|
||||
return app.exec();
|
||||
|
@ -197,7 +199,7 @@ void same_global_function(LoginWidget *logwid)
|
|||
|
||||
//! [14]
|
||||
QTranslator qtTranslator;
|
||||
if (qtTranslator.load(QLocale::system(), u"qtbase"_qs, u"_"_qs,
|
||||
if (qtTranslator.load(QLocale::system(), u"qtbase"_s, u"_"_s,
|
||||
QLibraryInfo::path(QLibraryInfo::TranslationsPath))) {
|
||||
app.installTranslator(&qtTranslator);
|
||||
}
|
||||
|
|
|
@ -50,12 +50,14 @@
|
|||
#include <QGuiApplication>
|
||||
#include <QQmlApplicationEngine>
|
||||
|
||||
using namespace Qt::StringLiterals;
|
||||
|
||||
int main(int argc, char *argv[])
|
||||
{
|
||||
QGuiApplication app(argc, argv);
|
||||
|
||||
QQmlApplicationEngine engine;
|
||||
const QUrl url(u"qrc:/alarms/main.qml"_qs);
|
||||
const QUrl url(u"qrc:/alarms/main.qml"_s);
|
||||
QObject::connect(&engine, &QQmlApplicationEngine::objectCreated, &app,
|
||||
[url](QObject *obj, const QUrl &objUrl) {
|
||||
if (!obj && url == objUrl)
|
||||
|
|
Loading…
Reference in New Issue