From 9da678fe4b2ceecd1d45c36c25f29b833711adef Mon Sep 17 00:00:00 2001
From: Tobias Hunger <tobias.hunger@nokia.com>
Date: Wed, 7 Jul 2010 16:43:45 +0200
Subject: [PATCH] Use outputparsers when creating S60 packages (cherry picked
from commit b87f3fbcc81108a19d286ffd341b0ed93db03f97)
---
.../qt4projectmanager/qt-s60/s60createpackagestep.cpp | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
index fa2c3136ee2..e8081c0daee 100644
--- a/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
+++ b/src/plugins/qt4projectmanager/qt-s60/s60createpackagestep.cpp
@@ -31,9 +31,11 @@
#include "qt4projectmanagerconstants.h"
#include "qt4buildconfiguration.h"
+#include "abldparser.h"
#include <projectexplorer/buildconfiguration.h>
#include <projectexplorer/target.h>
+#include <projectexplorer/gnumakeparser.h>
using namespace Qt4ProjectManager::Internal;
@@ -109,6 +111,11 @@ bool S60CreatePackageStep::init()
<< QLatin1String("QT_SIS_KEY=") + QDir::toNativeSeparators(customKeyPath());
}
setArguments(args); // overwrite any stuff done in make step
+
+ ProjectExplorer::GnuMakeParser *parser = new ProjectExplorer::GnuMakeParser;
+ parser->appendOutputParser(new Qt4ProjectManager::AbldParser);
+ setOutputParser(parser);
+
return true;
}
--
GitLab