diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-10-19 11:14:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2010-11-17 13:19:07 +0100 |
| commit | 1e362b0f8b0dfd712337df35cd26c5dc98dfc294 (patch) | |
| tree | dbb61c65fc1c3e84b507e03c2b3f62a36acd6488 /src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h | |
| parent | 531c70f05bfc8355f856f2af41be533fb13b85e6 (diff) | |
| download | qt-creator-1e362b0f8b0dfd712337df35cd26c5dc98dfc294.tar.gz | |
overhaul process argument handling
get away from argument stringlists. instead, use native shell command
lines which support quoting/splitting, environment variable expansion
and redirections with well-understood semantics.
Task-number: QTCREATORBUG-542
Task-number: QTCREATORBUG-1564
Diffstat (limited to 'src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h')
| -rw-r--r-- | src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h index d38edd6b4b..d28b77a9a0 100644 --- a/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h +++ b/src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.h @@ -32,8 +32,8 @@ #include <utils/environment.h> #include <utils/wizard.h> +#include <utils/qtcprocess.h> -#include <QtCore/QProcess> #include <QtGui/QPushButton> #include <QtGui/QComboBox> #include <QtGui/QLineEdit> @@ -81,8 +81,8 @@ public: QString sourceDirectory() const; void setBuildDirectory(const QString &directory); CMakeManager *cmakeManager() const; - QStringList arguments() const; - void setArguments(const QStringList &args); + QString arguments() const; + void setArguments(const QString &args); Utils::Environment environment() const; QString msvcVersion() const; void setMsvcVersion(const QString &version); @@ -93,7 +93,7 @@ private: CMakeManager *m_cmakeManager; QString m_buildDirectory; QString m_sourceDirectory; - QStringList m_arguments; + QString m_arguments; QString m_msvcVersion; bool m_creatingCbpFiles; Utils::Environment m_environment; @@ -140,7 +140,7 @@ private: CMakeOpenProjectWizard *m_cmakeWizard; QPlainTextEdit *m_output; QPushButton *m_runCMake; - QProcess *m_cmakeProcess; + Utils::QtcProcess *m_cmakeProcess; QLineEdit *m_argumentsLineEdit; Utils::PathChooser *m_cmakeExecutable; QComboBox *m_generatorComboBox; |