diff --git a/src/plugins/cmakeprojectmanager/cmakebuildtarget.cpp b/src/plugins/cmakeprojectmanager/cmakebuildtarget.cpp deleted file mode 100644 index 357f66f6a5a..00000000000 --- a/src/plugins/cmakeprojectmanager/cmakebuildtarget.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** 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 The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3 as published by the Free Software -** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-3.0.html. -** -****************************************************************************/ - -#include "cmakebuildtarget.h" - -using namespace Utils; - -namespace CMakeProjectManager { - -void CMakeBuildTarget::clear() -{ - executable.clear(); - makeCommand.clear(); - workingDirectory.clear(); - sourceDirectory.clear(); - title.clear(); - targetType = UtilityType; - includeFiles.clear(); - compilerOptions.clear(); - macros.clear(); - files.clear(); -} - -} // namespace CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/cmakebuildtarget.h b/src/plugins/cmakeprojectmanager/cmakebuildtarget.h index 1b3f5fb7002..a22bb804c10 100644 --- a/src/plugins/cmakeprojectmanager/cmakebuildtarget.h +++ b/src/plugins/cmakeprojectmanager/cmakebuildtarget.h @@ -57,8 +57,6 @@ public: QStringList compilerOptions; ProjectExplorer::Macros macros; QList files; - - void clear(); }; } // namespace CMakeProjectManager diff --git a/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp b/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp index c83c297ce6c..ca0247f6cb1 100644 --- a/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp +++ b/src/plugins/cmakeprojectmanager/cmakecbpparser.cpp @@ -234,7 +234,7 @@ void CMakeCbpParser::parseBuild() void CMakeCbpParser::parseBuildTarget() { - m_buildTarget.clear(); + m_buildTarget = CMakeBuildTarget(); if (attributes().hasAttribute("title")) m_buildTarget.title = attributes().value("title").toString(); diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro index 6f5ca828860..dc4e30223b0 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.pro @@ -41,7 +41,6 @@ SOURCES = builddirmanager.cpp \ builddirparameters.cpp \ builddirreader.cpp \ cmakebuildstep.cpp \ - cmakebuildtarget.cpp \ cmakeconfigitem.cpp \ cmakeproject.cpp \ cmakeprojectimporter.cpp \ diff --git a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs index e8baa388e76..e31c42886a9 100644 --- a/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs +++ b/src/plugins/cmakeprojectmanager/cmakeprojectmanager.qbs @@ -32,7 +32,6 @@ QtcPlugin { "cmakebuildsettingswidget.h", "cmakebuildstep.cpp", "cmakebuildstep.h", - "cmakebuildtarget.cpp", "cmakebuildtarget.h", "cmakecbpparser.cpp", "cmakecbpparser.h",