diff options
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp index 068fb5d703..e3979bbafb 100644 --- a/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeparsernodes.cpp @@ -783,9 +783,11 @@ bool QmakePriFile::ensureWriteableProFile(const QString &file) if (!versionControl || !versionControl->vcsOpen(file)) { bool makeWritable = QFile::setPermissions(file, fi.permissions() | QFile::WriteUser); if (!makeWritable) { - QMessageBox::warning(Core::ICore::mainWindow(), + QMessageBox::warning(Core::ICore::dialogParent(), QCoreApplication::translate("QmakePriFile", "Failed"), - QCoreApplication::translate("QmakePriFile", "Could not write project file %1.").arg(file)); + QCoreApplication::translate("QmakePriFile", + "Could not write project file %1.") + .arg(file)); return false; } } @@ -963,7 +965,7 @@ void QmakePriFile::save(const QStringList &lines) FileChangeBlocker changeGuard(filePath().toString()); QString errorMsg; if (!m_textFormat.writeFile(filePath().toString(), lines.join('\n'), &errorMsg)) { - QMessageBox::critical(Core::ICore::mainWindow(), QCoreApplication::translate( + QMessageBox::critical(Core::ICore::dialogParent(), QCoreApplication::translate( "QmakePriFile", "File Error"), errorMsg); } } @@ -981,7 +983,8 @@ void QmakePriFile::save(const QStringList &lines) errorStrings << errorString; } if (!errorStrings.isEmpty()) - QMessageBox::warning(Core::ICore::mainWindow(), QCoreApplication::translate("QmakePriFile", "File Error"), + QMessageBox::warning(Core::ICore::dialogParent(), + QCoreApplication::translate("QmakePriFile", "File Error"), errorStrings.join(QLatin1Char('\n'))); } @@ -1336,7 +1339,7 @@ QmakeEvalInput QmakeProFile::evalInput() const QmakeEvalInput input; input.projectDir = directoryPath().toString(); input.projectFilePath = filePath(); - input.buildDirectory = buildDir(); + input.buildDirectory = m_buildSystem->buildDir(m_filePath); input.sysroot = FilePath::fromString(m_buildSystem->qmakeSysroot()); input.readerExact = m_readerExact; input.readerCumulative = m_readerCumulative; @@ -1726,13 +1729,13 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult) // // Add/Remove pri files, sub projects // - FilePath buildDirectory = buildDir(); + FilePath buildDirectory = m_buildSystem->buildDir(m_filePath); makeEmpty(); for (QmakePriFile * const toAdd : qAsConst(result->directChildren)) addChild(toAdd); result->directChildren.clear(); - for (const auto priFiles : qAsConst(result->priFiles)) { + for (const auto &priFiles : qAsConst(result->priFiles)) { priFiles.first->finishInitialization(m_buildSystem, this); priFiles.first->update(priFiles.second); } @@ -1779,7 +1782,7 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult) [this](const QString &path) { return !m_wildcardWatcher->watchesDirectory(path); }); - for (QString path : directoriesToAdd) + for (const QString &path : directoriesToAdd) m_wildcardDirectoryContents.insert(path, QDir(path).entryList()); m_wildcardWatcher->addDirectories(directoriesToAdd, Utils::FileSystemWatcher::WatchModifiedDate); @@ -1796,7 +1799,7 @@ void QmakeProFile::applyEvaluate(QmakeEvalResult *evalResult) return !result->directoriesWithWildcards.contains(path); }); m_wildcardWatcher->removeDirectories(directoriesToRemove); - for (QString path : directoriesToRemove) + for (const QString &path : directoriesToRemove) m_wildcardDirectoryContents.remove(path); } } @@ -2069,20 +2072,6 @@ FilePath QmakeProFile::sourceDir() const return directoryPath(); } -FilePath QmakeProFile::buildDir(BuildConfiguration *bc) const -{ - if (!bc) - bc = m_buildSystem->target()->activeBuildConfiguration(); - - const QDir srcDirRoot = QDir(m_buildSystem->projectDirectory().toString()); - const QString relativeDir = srcDirRoot.relativeFilePath(directoryPath().toString()); - const QString buildConfigBuildDir = bc ? bc->buildDirectory().toString() : QString(); - const QString buildDir = buildConfigBuildDir.isEmpty() - ? m_buildSystem->projectDirectory().toString() - : buildConfigBuildDir; - return FilePath::fromString(QDir::cleanPath(QDir(buildDir).absoluteFilePath(relativeDir))); -} - FilePaths QmakeProFile::generatedFiles(const FilePath &buildDir, const FilePath &sourceFile, const FileType &sourceFileType) const |