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

Qmake: Proliferate FilePath use

Browse Source 
Change-Id: Id9bdaf127b9b45ec01a12c21dccd8955e5fd2846
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2021-08-12 15:04:18 +02:00
parent a09bedf1cb
commit 4ec490e77e
7 changed files with 63 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/plugins/qmakeprojectmanager/makefileparse.h
View File

@@ -25,9 +25,9 @@
#pragma once
#include <utils/fileutils.h>
#include <qtsupport/baseqtversion.h>
#include <qmakeprojectmanager/qmakestep.h>
#include <qtsupport/baseqtversion.h>
#include <utils/filepath.h>
namespace QmakeProjectManager {
namespace Internal {
@@ -43,13 +43,13 @@ class MakeFileParse
{
public:
enum class Mode { FilterKnownConfigValues, DoNotFilterKnownConfigValues };
MakeFileParse(const QString &makefile, Mode mode);
MakeFileParse(const Utils::FilePath &makefile, Mode mode);
enum MakefileState { MakefileMissing, CouldNotParse, Okay };
MakefileState makeFileState() const;
Utils::FilePath qmakePath() const;
QString srcProFile() const;
Utils::FilePath srcProFile() const;
QMakeStepConfig config() const;
QString unparsedArguments() const;
@@ -78,7 +78,7 @@ private:
const Mode m_mode;
MakefileState m_state;
Utils::FilePath m_qmakePath;
QString m_srcProFile;
Utils::FilePath m_srcProFile;
QmakeBuildConfig m_qmakeBuildConfig;
QMakeStepConfig m_config;