feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Port from QLatin1Literal to QLatin1String

Browse Source 
QLatin1Literal is an undocumented and deprecated typedef
for QLatin1String, just use the original.

Change-Id: I42347a2128e7b4280aaafeea5ebdee5a1b623c82
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Giuseppe D'Angelo
2019-06-11 19:40:11 +02:00
parent db7aa20d12
commit 885cd63e8f
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/qnx/qnxtoolchain.cpp
View File

@@ -52,7 +52,7 @@ static Abis detectTargetAbis(const FilePath &sdpPath)
if (!sdpPath.fileName().isEmpty()) { if (!sdpPath.fileName().isEmpty()) {
QList<Utils::EnvironmentItem> environment = QnxUtils::qnxEnvironment(sdpPath.toString()); QList<Utils::EnvironmentItem> environment = QnxUtils::qnxEnvironment(sdpPath.toString());
foreach (const Utils::EnvironmentItem &item, environment) { foreach (const Utils::EnvironmentItem &item, environment) {
if (item.name == QLatin1Literal("QNX_TARGET")) if (item.name == QLatin1String("QNX_TARGET"))
qnxTarget = FilePath::fromString(item.value); qnxTarget = FilePath::fromString(item.value);
} }
} }

8
src/plugins/studiowelcome/studiowelcomeplugin.cpp
View File

@@ -226,9 +226,9 @@ void StudioWelcomePlugin::extensionsInitialized()
s_view->setWindowModality(Qt::ApplicationModal); s_view->setWindowModality(Qt::ApplicationModal);
s_view->engine()->addImportPath("qrc:/studiofonts"); s_view->engine()->addImportPath("qrc:/studiofonts");
#ifdef QT_DEBUG #ifdef QT_DEBUG
s_view->engine()->addImportPath(QLatin1Literal(STUDIO_QML_PATH) s_view->engine()->addImportPath(QLatin1String(STUDIO_QML_PATH)
+ "splashscreen/imports"); + "splashscreen/imports");
s_view->setSource(QUrl::fromLocalFile(QLatin1Literal(STUDIO_QML_PATH) s_view->setSource(QUrl::fromLocalFile(QLatin1String(STUDIO_QML_PATH)
+ "splashscreen/main.qml")); + "splashscreen/main.qml"));
#else #else
s_view->engine()->addImportPath("qrc:/qml/splashscreen/imports"); s_view->engine()->addImportPath("qrc:/qml/splashscreen/imports");
@@ -287,9 +287,9 @@ WelcomeMode::WelcomeMode()
m_modeWidget->setResizeMode(QQuickWidget::SizeRootObjectToView); m_modeWidget->setResizeMode(QQuickWidget::SizeRootObjectToView);
m_modeWidget->engine()->addImportPath("qrc:/studiofonts"); m_modeWidget->engine()->addImportPath("qrc:/studiofonts");
#ifdef QT_DEBUG #ifdef QT_DEBUG
m_modeWidget->engine()->addImportPath(QLatin1Literal(STUDIO_QML_PATH) m_modeWidget->engine()->addImportPath(QLatin1String(STUDIO_QML_PATH)
+ "welcomepage/imports"); + "welcomepage/imports");
m_modeWidget->setSource(QUrl::fromLocalFile(QLatin1Literal(STUDIO_QML_PATH) m_modeWidget->setSource(QUrl::fromLocalFile(QLatin1String(STUDIO_QML_PATH)
+ "welcomepage/main.qml")); + "welcomepage/main.qml"));
#else #else
m_modeWidget->engine()->addImportPath("qrc:/qml/welcomepage/imports"); m_modeWidget->engine()->addImportPath("qrc:/qml/welcomepage/imports");

2
tests/auto/qml/codemodel/dependencies/tst_dependencies.cpp
View File

@@ -112,7 +112,7 @@ private:
void tst_Dependencies::initTestCase() void tst_Dependencies::initTestCase()
{ {
m_path = QLatin1Literal(TESTSRCDIR "/samples"); m_path = QLatin1String(TESTSRCDIR "/samples");
m_basePaths.append(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath)); m_basePaths.append(QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath));

4
tests/auto/qml/codemodel/ecmascript7/tst_ecmascript7.cpp
View File

@@ -134,13 +134,13 @@ void tst_Ecmascript::initTestCase()
QDirIterator it(sampledir, QDirIterator::Subdirectories); QDirIterator it(sampledir, QDirIterator::Subdirectories);
QStringList skipList = readSkipList(sampledir, QLatin1Literal("skip.txt")); QStringList skipList = readSkipList(sampledir, QLatin1String("skip.txt"));
while (it.hasNext()) { while (it.hasNext()) {
QString path = it.next(); QString path = it.next();
if (skipList.contains(path)) if (skipList.contains(path))
continue; continue;
QFileInfo f(path); QFileInfo f(path);
if (f.isFile() && f.suffix() == QLatin1Literal("js")) if (f.isFile() && f.suffix() == QLatin1String("js"))
m_files << f; m_files << f;
} }