forked from qt-creator/qt-creator
Remove KitInformationMacroExpander
Neither used nor needed anymore. Change-Id: I5f55af10eb5fe8aa4109c1fe0fc9f764f51c6b4a Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
@@ -35,7 +35,6 @@
|
|||||||
|
|
||||||
#include <projectexplorer/toolchain.h>
|
#include <projectexplorer/toolchain.h>
|
||||||
#include <projectexplorer/projectexplorerconstants.h>
|
#include <projectexplorer/projectexplorerconstants.h>
|
||||||
#include <projectexplorer/kitinformationmacroexpander.h>
|
|
||||||
|
|
||||||
#include <utils/fileutils.h>
|
#include <utils/fileutils.h>
|
||||||
#include <utils/macroexpander.h>
|
#include <utils/macroexpander.h>
|
||||||
|
@@ -1,52 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
|
||||||
** Contact: http://www.qt-project.org/legal
|
|
||||||
**
|
|
||||||
** This file is part of Qt Creator.
|
|
||||||
**
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and Digia. For licensing terms and
|
|
||||||
** conditions see http://www.qt.io/licensing. For further information
|
|
||||||
** use the contact form at http://www.qt.io/contact-us.
|
|
||||||
**
|
|
||||||
** 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 or version 3 as published by the Free
|
|
||||||
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
||||||
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
||||||
** following information to ensure the GNU Lesser General Public License
|
|
||||||
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
||||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
||||||
**
|
|
||||||
** In addition, as a special exception, Digia gives you certain additional
|
|
||||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
||||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#include "kitinformationmacroexpander.h"
|
|
||||||
|
|
||||||
#include <utils/qtcassert.h>
|
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
|
||||||
|
|
||||||
KitInformationMacroExpander::KitInformationMacroExpander(const Kit *k) :
|
|
||||||
m_kit(k)
|
|
||||||
{
|
|
||||||
QTC_CHECK(k);
|
|
||||||
}
|
|
||||||
|
|
||||||
const Kit *KitInformationMacroExpander::kit() const
|
|
||||||
{
|
|
||||||
return m_kit;
|
|
||||||
}
|
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
|
||||||
// KitInformationMacroExpander:
|
|
||||||
// --------------------------------------------------------------------------
|
|
||||||
|
|
||||||
} // namespace ProjectExplorer
|
|
@@ -1,59 +0,0 @@
|
|||||||
/****************************************************************************
|
|
||||||
**
|
|
||||||
** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
|
|
||||||
** Contact: http://www.qt-project.org/legal
|
|
||||||
**
|
|
||||||
** This file is part of Qt Creator.
|
|
||||||
**
|
|
||||||
** Commercial License Usage
|
|
||||||
** Licensees holding valid commercial Qt licenses may use this file in
|
|
||||||
** accordance with the commercial license agreement provided with the
|
|
||||||
** Software or, alternatively, in accordance with the terms contained in
|
|
||||||
** a written agreement between you and Digia. For licensing terms and
|
|
||||||
** conditions see http://www.qt.io/licensing. For further information
|
|
||||||
** use the contact form at http://www.qt.io/contact-us.
|
|
||||||
**
|
|
||||||
** 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 or version 3 as published by the Free
|
|
||||||
** Software Foundation and appearing in the file LICENSE.LGPLv21 and
|
|
||||||
** LICENSE.LGPLv3 included in the packaging of this file. Please review the
|
|
||||||
** following information to ensure the GNU Lesser General Public License
|
|
||||||
** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
|
|
||||||
** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
|
|
||||||
**
|
|
||||||
** In addition, as a special exception, Digia gives you certain additional
|
|
||||||
** rights. These rights are described in the Digia Qt LGPL Exception
|
|
||||||
** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
|
|
||||||
**
|
|
||||||
****************************************************************************/
|
|
||||||
|
|
||||||
#ifndef KITINFORMATIONMACROEXPANDER_H
|
|
||||||
#define KITINFORMATIONMACROEXPANDER_H
|
|
||||||
|
|
||||||
#include "projectexplorer_export.h"
|
|
||||||
|
|
||||||
#include <utils/macroexpander.h>
|
|
||||||
|
|
||||||
namespace ProjectExplorer {
|
|
||||||
|
|
||||||
class Kit;
|
|
||||||
|
|
||||||
// --------------------------------------------------------------------------
|
|
||||||
// KitInformationMacroExpander:
|
|
||||||
// --------------------------------------------------------------------------
|
|
||||||
|
|
||||||
class PROJECTEXPLORER_EXPORT KitInformationMacroExpander : public Utils::MacroExpander
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
KitInformationMacroExpander(const Kit *k);
|
|
||||||
|
|
||||||
const Kit *kit() const;
|
|
||||||
|
|
||||||
private:
|
|
||||||
const Kit *m_kit;
|
|
||||||
};
|
|
||||||
|
|
||||||
} // namespace ProjectExplorer
|
|
||||||
|
|
||||||
#endif // KITINFORMATIONMACROEXPANDER_H
|
|
@@ -30,7 +30,6 @@ HEADERS += projectexplorer.h \
|
|||||||
kitinformation.h \
|
kitinformation.h \
|
||||||
kitinformationconfigwidget.h \
|
kitinformationconfigwidget.h \
|
||||||
kitfeatureprovider.h \
|
kitfeatureprovider.h \
|
||||||
kitinformationmacroexpander.h \
|
|
||||||
kitmanager.h \
|
kitmanager.h \
|
||||||
kitmanagerconfigwidget.h \
|
kitmanagerconfigwidget.h \
|
||||||
kitmodel.h \
|
kitmodel.h \
|
||||||
@@ -179,7 +178,6 @@ SOURCES += projectexplorer.cpp \
|
|||||||
kitconfigwidget.cpp \
|
kitconfigwidget.cpp \
|
||||||
kitinformation.cpp \
|
kitinformation.cpp \
|
||||||
kitinformationconfigwidget.cpp \
|
kitinformationconfigwidget.cpp \
|
||||||
kitinformationmacroexpander.cpp \
|
|
||||||
kitmanager.cpp \
|
kitmanager.cpp \
|
||||||
kitmanagerconfigwidget.cpp \
|
kitmanagerconfigwidget.cpp \
|
||||||
kitmodel.cpp \
|
kitmodel.cpp \
|
||||||
|
@@ -92,7 +92,6 @@ QtcPlugin {
|
|||||||
"kitfeatureprovider.h",
|
"kitfeatureprovider.h",
|
||||||
"kitinformation.cpp", "kitinformation.h",
|
"kitinformation.cpp", "kitinformation.h",
|
||||||
"kitinformationconfigwidget.cpp", "kitinformationconfigwidget.h",
|
"kitinformationconfigwidget.cpp", "kitinformationconfigwidget.h",
|
||||||
"kitinformationmacroexpander.cpp", "kitinformationmacroexpander.h",
|
|
||||||
"kitmanager.cpp", "kitmanager.h",
|
"kitmanager.cpp", "kitmanager.h",
|
||||||
"kitmanagerconfigwidget.cpp", "kitmanagerconfigwidget.h",
|
"kitmanagerconfigwidget.cpp", "kitmanagerconfigwidget.h",
|
||||||
"kitmodel.cpp", "kitmodel.h",
|
"kitmodel.cpp", "kitmodel.h",
|
||||||
|
@@ -35,8 +35,6 @@
|
|||||||
#include "qtversionmanager.h"
|
#include "qtversionmanager.h"
|
||||||
#include "qtparser.h"
|
#include "qtparser.h"
|
||||||
|
|
||||||
#include <projectexplorer/kitinformationmacroexpander.h>
|
|
||||||
|
|
||||||
#include <utils/buildablehelperlibrary.h>
|
#include <utils/buildablehelperlibrary.h>
|
||||||
#include <utils/macroexpander.h>
|
#include <utils/macroexpander.h>
|
||||||
#include <utils/qtcassert.h>
|
#include <utils/qtcassert.h>
|
||||||
|
Reference in New Issue
Block a user