diff options
| author | Oswald Buddenhagen <[email protected]> | 2010-10-19 11:14:03 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <[email protected]> | 2010-11-17 13:19:07 +0100 |
| commit | 1e362b0f8b0dfd712337df35cd26c5dc98dfc294 (patch) | |
| tree | dbb61c65fc1c3e84b507e03c2b3f62a36acd6488 /src/plugins/qt4projectmanager/qtversionmanager.h | |
| parent | 531c70f05bfc8355f856f2af41be533fb13b85e6 (diff) | |
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/qt4projectmanager/qtversionmanager.h')
| -rw-r--r-- | src/plugins/qt4projectmanager/qtversionmanager.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/src/plugins/qt4projectmanager/qtversionmanager.h b/src/plugins/qt4projectmanager/qtversionmanager.h index 90d52c95ab2..9462a7ffb4d 100644 --- a/src/plugins/qt4projectmanager/qtversionmanager.h +++ b/src/plugins/qt4projectmanager/qtversionmanager.h @@ -265,9 +265,9 @@ public: // Static Methods static bool makefileIsFor(const QString &makefile, const QString &proFile); - static QPair<QtVersion::QmakeBuildConfigs, QStringList> scanMakeFile(const QString &makefile, - QtVersion::QmakeBuildConfigs defaultBuildConfig); - static QString findQMakeBinaryFromMakefile(const QString &makefile); + static QPair<QtVersion::QmakeBuildConfigs, QString> scanMakeFile(const QString &makefile, + QtVersion::QmakeBuildConfigs defaultBuildConfig); + static QString findQMakeBinaryFromMakefile(const QString &directory); bool isValidId(int id) const; signals: @@ -281,11 +281,10 @@ private: static bool equals(QtVersion *a, QtVersion *b); static QString findQMakeLine(const QString &directory, const QString &key); static QString trimLine(const QString line); - static QStringList splitLine(const QString &line); - static void parseParts(const QStringList &parts, - QList<QMakeAssignment> *assignments, - QList<QMakeAssignment> *afterAssignments, - QStringList *additionalArguments); + static void parseArgs(const QString &args, + QList<QMakeAssignment> *assignments, + QList<QMakeAssignment> *afterAssignments, + QString *additionalArguments); static QtVersion::QmakeBuildConfigs qmakeBuildConfigFromCmdArgs(QList<QMakeAssignment> *assignments, QtVersion::QmakeBuildConfigs defaultBuildConfig); // Used by QtOptionsPage |