diff options
Diffstat (limited to 'src/plugins/qmakeprojectmanager/qmakestep.h')
| -rw-r--r-- | src/plugins/qmakeprojectmanager/qmakestep.h | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/src/plugins/qmakeprojectmanager/qmakestep.h b/src/plugins/qmakeprojectmanager/qmakestep.h index 90fef01d35..0ca5a7e6e9 100644 --- a/src/plugins/qmakeprojectmanager/qmakestep.h +++ b/src/plugins/qmakeprojectmanager/qmakestep.h @@ -133,9 +133,13 @@ public: // arguments set by the user QString userArguments(); void setUserArguments(const QString &arguments); - // QMake extra arguments. Not user editable. + // Extra arguments for qmake and pro file parser. Not user editable via UI. QStringList extraArguments() const; void setExtraArguments(const QStringList &args); + /* Extra arguments for pro file parser only. Not user editable via UI. + * This function is used in 3rd party plugin SailfishOS. */ + QStringList extraParserArguments() const; + void setExtraParserArguments(const QStringList &args); QString mkspec() const; bool linkQmlDebuggingLibrary() const; void setLinkQmlDebuggingLibrary(bool enable); @@ -166,16 +170,16 @@ private: void doCancel() override; void finish(bool success) override; - void startOneCommand(const Utils::FilePath &command, const QString &args); + void startOneCommand(const Utils::CommandLine &command); void runNextCommand(); - Utils::FilePath m_qmakeExecutable; - QString m_qmakeArguments; - Utils::FilePath m_makeExecutable; - QString m_makeArguments; + Utils::CommandLine m_qmakeCommand; + Utils::CommandLine m_makeCommand; QString m_userArgs; - // Extra arguments for qmake. + // Extra arguments for qmake and pro file parser QStringList m_extraArgs; + // Extra arguments for pro file parser only + QStringList m_extraParserArgs; // last values enum class State { IDLE = 0, RUN_QMAKE, RUN_MAKE_QMAKE_ALL, POST_PROCESS }; @@ -207,6 +211,7 @@ private: void linkQmlDebuggingLibraryChanged(); void useQtQuickCompilerChanged(); void separateDebugInfoChanged(); + void abisChanged(); // slots for dealing with user changes in our UI void qmakeArgumentsLineEdited(); @@ -226,6 +231,8 @@ private: Internal::Ui::QMakeStep *m_ui = nullptr; QMakeStep *m_step = nullptr; bool m_ignoreChange = false; + int m_preferredAbiIndex = -1; + QString m_abisParam; }; } // namespace QmakeProjectManager |