diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-05-09 12:47:02 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-06-19 16:37:49 +0200 |
| commit | d8b2998daeab9bfb7bfb5182960ec09b94885b17 (patch) | |
| tree | 71dd697bcb8b5b03b4509c41bdf83a3060d56c90 /qmake/option.h | |
| parent | 28f193ab5368bf647d7169abefd2d34af537e18d (diff) | |
Revert "move finding the makespec to Option"
Needed for an upcoming revert.
This reverts commit 74a6669fa7c0d6e2cb7d34d56332d620d2a07755.
Conflicts:
qmake/option.cpp
qmake/project.cpp
qmake/property.cpp
Change-Id: I56088506d27bf1f095f9261c75224f4bee17ec60
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'qmake/option.h')
| -rw-r--r-- | qmake/option.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/qmake/option.h b/qmake/option.h index 23384877fd..ce680b0d6a 100644 --- a/qmake/option.h +++ b/qmake/option.h @@ -109,7 +109,6 @@ struct Option //both of these must be called.. static int init(int argc=0, char **argv=0); //parse cmdline static void applyHostMode(); - static QStringList mkspecPaths(); static bool prepareProject(const QString &pfile); static bool postProcessProject(QMakeProject *); @@ -214,7 +213,6 @@ struct Option private: static int parseCommandLine(int, char **, int=0); - static bool resolveSpec(QString *spec); }; inline QString fixEnvVariables(const QString &x) { return Option::fixString(x, Option::FixEnvVars); } |