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

Qnx/Qmake: More FileName::appendPath -> pathAppended changes

Browse Source 
Change-Id: Ibd6639ff83ec922fade7de4115d1e777e496f3e1
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
This commit is contained in:
hjk
2019-05-15 15:57:56 +02:00
parent 09c1c1a354
commit 95f49285b7
4 changed files with 13 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/qnx/qnxconfiguration.cpp
View File

@@ -354,7 +354,7 @@ void QnxConfiguration::setVersion(const QnxVersionNumber &version)
void QnxConfiguration::readInformation()
{
QString qConfigPath = FileName(m_qnxConfiguration).appendPath("qconfig").toString();
const QString qConfigPath = m_qnxConfiguration.pathAppended("qconfig").toString();
QList <ConfigInstallInformation> installInfoList = QnxUtils::installedConfigs(qConfigPath);
if (installInfoList.isEmpty())
return;
@@ -418,13 +418,13 @@ void QnxConfiguration::updateTargets()
void QnxConfiguration::assignDebuggersToTargets()
{
QDir hostUsrBinDir(FileName(m_qnxHost).appendPath("usr/bin").toString());
const QDir hostUsrBinDir(m_qnxHost.pathAppended("usr/bin").toString());
QStringList debuggerNames = hostUsrBinDir.entryList(
QStringList(HostOsInfo::withExecutableSuffix(QLatin1String("nto*-gdb"))),
QDir::Files);
foreach (const QString &debuggerName, debuggerNames) {
FileName debuggerPath = FileName::fromString(hostUsrBinDir.path())
.appendPath(debuggerName);
const FileName debuggerPath = FileName::fromString(hostUsrBinDir.path())
.pathAppended(debuggerName);
DebuggerItem item;
item.setCommand(debuggerPath);
item.reinitializeFromFile();

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

@@ -219,7 +219,7 @@ QList<QnxTarget> QnxUtils::findTargets(const Utils::FileName &basePath)
QDirIterator iterator(basePath.toString());
while (iterator.hasNext()) {
iterator.next();
FileName libc = FileName::fromString(iterator.filePath()).appendPath("lib/libc.so");
const FileName libc = FileName::fromString(iterator.filePath()).pathAppended("lib/libc.so");
if (libc.exists()) {
auto abis = Abi::abisOfBinary(libc);
if (abis.isEmpty()) {

14
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -444,12 +444,10 @@ FileName BaseQtVersion::binPath() const
FileName BaseQtVersion::mkspecsPath() const
{
FileName result = FileName::fromUserInput(qmakeProperty("QT_HOST_DATA"));
const FileName result = FileName::fromUserInput(qmakeProperty("QT_HOST_DATA"));
if (result.isEmpty())
result = FileName::fromUserInput(qmakeProperty("QMAKE_MKSPECS"));
else
result.appendPath("mkspecs");
return result;
return FileName::fromUserInput(qmakeProperty("QMAKE_MKSPECS"));
return result.pathAppended("mkspecs");
}
FileName BaseQtVersion::qmlBinPath() const
@@ -906,7 +904,7 @@ void BaseQtVersion::updateMkspec() const
m_mkspec = m_mkspec.relativeChildPath(baseMkspecDir);
// qDebug() << "Setting mkspec to"<<mkspec;
} else {
FileName sourceMkSpecPath = sourcePath().appendPath("mkspecs");
const FileName sourceMkSpecPath = sourcePath().pathAppended("mkspecs");
if (m_mkspec.isChildOf(sourceMkSpecPath)) {
m_mkspec = m_mkspec.relativeChildPath(sourceMkSpecPath);
} else {
@@ -1819,8 +1817,8 @@ FileNameList BaseQtVersion::qtCorePaths() const
&& file.startsWith("QtCore")
&& file.endsWith(".framework")) {
// handle Framework
FileName lib = FileName::fromFileInfo(info);
dynamicLibs.append(lib.appendPath(file.left(file.lastIndexOf('.'))));
const FileName lib = FileName::fromFileInfo(info);
dynamicLibs.append(lib.pathAppended(file.left(file.lastIndexOf('.'))));
} else if (info.isReadable()) {
if (file.startsWith("libQtCore")
|| file.startsWith("libQt5Core")

4
src/plugins/qtsupport/desktopqtversion.cpp
View File

@@ -94,8 +94,8 @@ QString DesktopQtVersion::qmlsceneCommand() const
ensureMkSpecParsed();
QString path =
qmlBinPath().appendPath(Utils::HostOsInfo::withExecutableSuffix("qmlscene")).toString();
const QString path =
qmlBinPath().pathAppended(Utils::HostOsInfo::withExecutableSuffix("qmlscene")).toString();
m_qmlsceneCommand = QFileInfo(path).isFile() ? path : QString();