diff --git a/src/plugins/qnx/qnxtoolchain.cpp b/src/plugins/qnx/qnxtoolchain.cpp index 376ae637113..0a515287ea2 100644 --- a/src/plugins/qnx/qnxtoolchain.cpp +++ b/src/plugins/qnx/qnxtoolchain.cpp @@ -52,7 +52,7 @@ static Abis detectTargetAbis(const FilePath &sdpPath) if (!sdpPath.fileName().isEmpty()) { QList environment = QnxUtils::qnxEnvironment(sdpPath.toString()); foreach (const Utils::EnvironmentItem &item, environment) { - if (item.name == QLatin1Literal("QNX_TARGET")) + if (item.name == QLatin1String("QNX_TARGET")) qnxTarget = FilePath::fromString(item.value); } } diff --git a/src/plugins/studiowelcome/studiowelcomeplugin.cpp b/src/plugins/studiowelcome/studiowelcomeplugin.cpp index 864acf4e83f..cc220576604 100644 --- a/src/plugins/studiowelcome/studiowelcomeplugin.cpp +++ b/src/plugins/studiowelcome/studiowelcomeplugin.cpp @@ -226,9 +226,9 @@ void StudioWelcomePlugin::extensionsInitialized() s_view->setWindowModality(Qt::ApplicationModal); s_view->engine()->addImportPath("qrc:/studiofonts"); #ifdef QT_DEBUG - s_view->engine()->addImportPath(QLatin1Literal(STUDIO_QML_PATH) + s_view->engine()->addImportPath(QLatin1String(STUDIO_QML_PATH) + "splashscreen/imports"); - s_view->setSource(QUrl::fromLocalFile(QLatin1Literal(STUDIO_QML_PATH) + s_view->setSource(QUrl::fromLocalFile(QLatin1String(STUDIO_QML_PATH) + "splashscreen/main.qml")); #else s_view->engine()->addImportPath("qrc:/qml/splashscreen/imports"); @@ -287,9 +287,9 @@ WelcomeMode::WelcomeMode() m_modeWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); m_modeWidget->engine()->addImportPath("qrc:/studiofonts"); #ifdef QT_DEBUG - m_modeWidget->engine()->addImportPath(QLatin1Literal(STUDIO_QML_PATH) + m_modeWidget->engine()->addImportPath(QLatin1String(STUDIO_QML_PATH) + "welcomepage/imports"); - m_modeWidget->setSource(QUrl::fromLocalFile(QLatin1Literal(STUDIO_QML_PATH) + m_modeWidget->setSource(QUrl::fromLocalFile(QLatin1String(STUDIO_QML_PATH) + "welcomepage/main.qml")); #else m_modeWidget->engine()->addImportPath("qrc:/qml/welcomepage/imports"); diff --git a/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp b/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp index 71e5d50735d..79ce9cec1be 100644 --- a/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp +++ b/tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp @@ -112,7 +112,7 @@ private: void tst_Dependencies::initTestCase() { - m_path = QLatin1Literal(TESTSRCDIR "/samples"); + m_path = QLatin1String(TESTSRCDIR "/samples"); m_basePaths.append(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath)); diff --git a/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp b/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp index f178338bd16..735daa04f71 100644 --- a/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp +++ b/tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp @@ -134,13 +134,13 @@ void tst_Ecmascript::initTestCase() QDirIterator it(sampledir, QDirIterator::Subdirectories); - QStringList skipList = readSkipList(sampledir, QLatin1Literal("skip.txt")); + QStringList skipList = readSkipList(sampledir, QLatin1String("skip.txt")); while (it.hasNext()) { QString path = it.next(); if (skipList.contains(path)) continue; QFileInfo f(path); - if (f.isFile() && f.suffix() == QLatin1Literal("js")) + if (f.isFile() && f.suffix() == QLatin1String("js")) m_files << f; }