diff options
author | hjk <hjk@qt.io> | 2019-05-17 12:32:05 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-05-17 11:55:04 +0000 |
commit | f4c9e5e5c4b7f61d28e34c1912965c0e27d3b0e6 (patch) | |
tree | 18f296e0ca70bb0a6ac9428b9dceee43ca8d0131 /src/plugins/qtsupport | |
parent | 0565457b5c16564d2b230dca8eea6d94024efae2 (diff) |
More FileName::appendPath() -> .pathAppended()
Change-Id: I403d34e4f52f758339c158efc7a11fd329e3e043
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/plugins/qtsupport')
-rw-r--r-- | src/plugins/qtsupport/baseqtversion.cpp | 2 | ||||
-rw-r--r-- | src/plugins/qtsupport/gettingstartedwelcomepage.cpp | 4 | ||||
-rw-r--r-- | src/plugins/qtsupport/qscxmlcgenerator.cpp | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/qtsupport/baseqtversion.cpp b/src/plugins/qtsupport/baseqtversion.cpp index 7316994a801..d78a8091bff 100644 --- a/src/plugins/qtsupport/baseqtversion.cpp +++ b/src/plugins/qtsupport/baseqtversion.cpp @@ -469,7 +469,7 @@ FileNameList BaseQtVersion::directoriesToIgnoreInProjectTree() const FileName mkspecPathSrc = FileName::fromUserInput(qmakeProperty("QT_HOST_DATA", PropertyVariantSrc)); if (!mkspecPathSrc.isEmpty()) { - mkspecPathSrc.appendPath("mkspecs"); + mkspecPathSrc = mkspecPathSrc.pathAppended("mkspecs"); if (mkspecPathSrc != mkspecPathGet) result.append(mkspecPathSrc); } diff --git a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp index 00748deafac..63b9175c094 100644 --- a/src/plugins/qtsupport/gettingstartedwelcomepage.cpp +++ b/src/plugins/qtsupport/gettingstartedwelcomepage.cpp @@ -159,8 +159,8 @@ QString ExamplesWelcomePage::copyToAlternativeLocation(const QFileInfo& proFileI it->replace(projectDir, targetDir); foreach (const QString &dependency, dependencies) { - FileName targetFile = FileName::fromString(targetDir); - targetFile.appendPath(QDir(dependency).dirName()); + const FileName targetFile = FileName::fromString(targetDir) + .pathAppended(QDir(dependency).dirName()); if (!FileUtils::copyRecursively(FileName::fromString(dependency), targetFile, &error)) { QMessageBox::warning(ICore::mainWindow(), tr("Cannot Copy Project"), error); diff --git a/src/plugins/qtsupport/qscxmlcgenerator.cpp b/src/plugins/qtsupport/qscxmlcgenerator.cpp index 4d1fc8e50a3..b5d65a5ccd9 100644 --- a/src/plugins/qtsupport/qscxmlcgenerator.cpp +++ b/src/plugins/qtsupport/qscxmlcgenerator.cpp @@ -118,8 +118,7 @@ FileNameToContentsHash QScxmlcGenerator::handleProcessFinished(QProcess *process const Utils::FileName wd = workingDirectory(); FileNameToContentsHash result; forEachTarget([&](const Utils::FileName &target) { - Utils::FileName file = wd; - file.appendPath(target.fileName()); + const Utils::FileName file = wd.pathAppended(target.fileName()); QFile generated(file.toString()); if (!generated.open(QIODevice::ReadOnly)) return; |