introduce QMakeHandler

this is QMakeEvaluatorHandler, but derived from QMakeParserHandler.
the idea is that the parser can be used stand-alone, while the evaluator
needs the parser as well.
we will need it in QMakeGlobals as well, so put it there, as that is the
most central place.

Change-Id: I6ee46c0e4b2e044bf3bfc6e4235b53525ddfc875
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

1 files changed, 2 insertions, 6 deletions

diff --git a/tests/manual/proparser/main.cpp b/tests/manual/proparser/main.cpp
index 43d55eab1b..5aa0c36308 100644
--- a/tests/manual/proparser/main.cpp
+++ b/tests/manual/proparser/main.cpp
@@ -53,14 +53,11 @@ static void print(const QString &fileName, int lineNo, const QString &msg)
         qWarning("%s", qPrintable(msg));
 }
 
-class ParseHandler : public QMakeParserHandler {
+class EvalHandler : public QMakeHandler {
 public:
     virtual void parseError(const QString &fileName, int lineNo, const QString &msg)
         { print(fileName, lineNo, msg); }
-};
 
-class EvalHandler : public QMakeEvaluatorHandler {
-public:
     virtual void configError(const QString &msg)
         { qWarning("%s", qPrintable(msg)); }
     virtual void evalError(const QString &fileName, int lineNo, const QString &msg)
@@ -72,7 +69,6 @@ public:
     virtual void doneWithEval(ProFile *) {}
 };
 
-static ParseHandler parseHandler;
 static EvalHandler evalHandler;
 
 static QString value(ProFileEvaluator &reader, const QString &variable)
@@ -165,7 +161,7 @@ int main(int argc, char **argv)
     option.initProperties(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QLatin1String("/qmake"));
     if (args.count() >= 4)
         option.setCommandLineArguments(args.mid(3));
-    QMakeParser parser(0, &parseHandler);
+    QMakeParser parser(0, &evalHandler);
 
     bool cumulative = args[0] == QLatin1String("true");
     QFileInfo infi(args[1]);