Move QMakeParser to Qt4ProjectManager

7 files changed, 0 insertions, 146 deletions

diff --git a/src/plugins/projectexplorer/buildparserfactory.cpp b/src/plugins/projectexplorer/buildparserfactory.cpp
index cb9326d68b..e4b8895eae 100644
--- a/src/plugins/projectexplorer/buildparserfactory.cpp
+++ b/src/plugins/projectexplorer/buildparserfactory.cpp
@@ -32,7 +32,6 @@
 #include "projectexplorerconstants.h"
 #include "gccparser.h"
 #include "msvcparser.h"
-#include "qmakeparser.h"
 
 using namespace ProjectExplorer::Internal;
 
@@ -65,18 +64,3 @@ ProjectExplorer::IBuildParser * MsvcParserFactory::create(const QString & name)
     Q_UNUSED(name)
     return new MsvcParser();
 }
-
-QMakeParserFactory::~QMakeParserFactory()
-{
-}
-
-bool QMakeParserFactory::canCreate(const QString & name) const
-{
-    return (name == Constants::BUILD_PARSER_QMAKE);
-}
-
-ProjectExplorer::IBuildParser * QMakeParserFactory::create(const QString & name) const
-{
-    Q_UNUSED(name)
-    return new QMakeParser();
-}
diff --git a/src/plugins/projectexplorer/buildparserfactory.h b/src/plugins/projectexplorer/buildparserfactory.h
index f953d63ebf..e29570f2ba 100644
--- a/src/plugins/projectexplorer/buildparserfactory.h
+++ b/src/plugins/projectexplorer/buildparserfactory.h
@@ -55,16 +55,6 @@ public:
     virtual ProjectExplorer::IBuildParser * create(const QString & name) const;
 };
 
-class QMakeParserFactory : public ProjectExplorer::IBuildParserFactory
-{
-    Q_OBJECT
-public:
-    QMakeParserFactory() {}
-    virtual ~QMakeParserFactory();
-    virtual bool canCreate(const QString & name) const;
-    virtual ProjectExplorer::IBuildParser * create(const QString & name) const;
-};
-
 } // namespace Internal
 } // namespace ProjectExplorer
 
diff --git a/src/plugins/projectexplorer/projectexplorer.cpp b/src/plugins/projectexplorer/projectexplorer.cpp
index 2f2da8c6e0..c15c303e3a 100644
--- a/src/plugins/projectexplorer/projectexplorer.cpp
+++ b/src/plugins/projectexplorer/projectexplorer.cpp
@@ -307,7 +307,6 @@ bool ProjectExplorerPlugin::initialize(const QStringList &arguments, QString *er
     // Build parsers
     addAutoReleasedObject(new GccParserFactory);
     addAutoReleasedObject(new MsvcParserFactory);
-    addAutoReleasedObject(new QMakeParserFactory);
 
     // Settings page
     addAutoReleasedObject(new ProjectExplorerSettingsPage);
diff --git a/src/plugins/projectexplorer/projectexplorer.pro b/src/plugins/projectexplorer/projectexplorer.pro
index 8aaba10473..325f624a32 100644
--- a/src/plugins/projectexplorer/projectexplorer.pro
+++ b/src/plugins/projectexplorer/projectexplorer.pro
@@ -66,7 +66,6 @@ HEADERS += projectexplorer.h \
     projectexplorersettingspage.h \
     projectwelcomepage.h \
     projectwelcomepagewidget.h \
-    qmakeparser.h \
     baseprojectwizarddialog.h
 SOURCES += projectexplorer.cpp \
     projectwindow.cpp \
@@ -121,7 +120,6 @@ SOURCES += projectexplorer.cpp \
     projectwelcomepage.cpp \
     projectwelcomepagewidget.cpp \
     corelistenercheckingforrunningbuild.cpp \
-    qmakeparser.cpp \
     baseprojectwizarddialog.cpp
 FORMS += processstep.ui \
     editorsettingspropertiespage.ui \
diff --git a/src/plugins/projectexplorer/projectexplorerconstants.h b/src/plugins/projectexplorer/projectexplorerconstants.h
index 262cc51367..958391e637 100644
--- a/src/plugins/projectexplorer/projectexplorerconstants.h
+++ b/src/plugins/projectexplorer/projectexplorerconstants.h
@@ -179,7 +179,6 @@ const char * const FORM_MIMETYPE = "application/x-designer";
 const char * const RESOURCE_MIMETYPE = "application/vnd.nokia.xml.qt.resource";
 
 // build parsers
-const char * const BUILD_PARSER_QMAKE       = "BuildParser.QMake";
 const char * const BUILD_PARSER_MSVC        = "BuildParser.MSVC";
 const char * const BUILD_PARSER_GCC         = "BuildParser.Gcc";
 const char * const BUILD_PARSER_RVCT        = "BuildParser.Rvct";
diff --git a/src/plugins/projectexplorer/qmakeparser.cpp b/src/plugins/projectexplorer/qmakeparser.cpp
deleted file mode 100644
index 4425835f4e..0000000000
--- a/src/plugins/projectexplorer/qmakeparser.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#include "qmakeparser.h"
-#include "projectexplorerconstants.h"
-#include "taskwindow.h"
-
-using namespace ProjectExplorer;
-
-QMakeParser::QMakeParser()
-{
-}
-
-QString QMakeParser::name() const
-{
-    return QLatin1String(ProjectExplorer::Constants::BUILD_PARSER_QMAKE);
-}
-
-void QMakeParser::stdOutput(const QString & line)
-{
-    Q_UNUSED(line)
-}
-
-void QMakeParser::stdError(const QString & line)
-{
-    QString lne(line.trimmed());
-    if (lne.startsWith("Project ERROR:"))
-    {
-        lne = lne.mid(15);
-        emit addToTaskWindow(TaskWindow::Task(TaskWindow::Error,
-                                              lne /* description */,
-                                              QString() /* filename */,
-                                              -1 /* linenumber */,
-                                              Constants::TASK_CATEGORY_BUILDSYSTEM));
-        return;
-    }
-}
diff --git a/src/plugins/projectexplorer/qmakeparser.h b/src/plugins/projectexplorer/qmakeparser.h
deleted file mode 100644
index 5d5a1b02bb..0000000000
--- a/src/plugins/projectexplorer/qmakeparser.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/**************************************************************************
-**
-** This file is part of Qt Creator
-**
-** Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).
-**
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** Commercial Usage
-**
-** Licensees holding valid Qt Commercial licenses may use this file in
-** accordance with the Qt Commercial License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Nokia.
-**
-** GNU Lesser General Public License Usage
-**
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL included in the
-** packaging of this file.  Please review the following information to
-** ensure the GNU Lesser General Public License version 2.1 requirements
-** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
-**
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at http://qt.nokia.com/contact.
-**
-**************************************************************************/
-
-#ifndef QMAKEPARSER_H
-#define QMAKEPARSER_H
-
-#include "ibuildparser.h"
-
-#include <QtCore/QRegExp>
-
-namespace ProjectExplorer {
-
-class QMakeParser : public ProjectExplorer::IBuildParser
-{
-    Q_OBJECT
-
-public:
-    QMakeParser();
-    QString name() const;
-    virtual void stdOutput(const QString & line);
-    virtual void stdError(const QString & line);
-private:
-};
-
-} // namespace ProjectExplorer
-
-#endif // QMAKEPARSER_H