Commit f911ddba authored by Christian Kandeler's avatar Christian Kandeler Committed by Joerg Bornemann
Browse files

QbsProjectManager: Remove a redundant header file



Somebody mistakenly introduced qbsconstants.h, even though
qbsprojectmanagerconstants.h already existed for that purpose. Merge
these two files and remove the newer one.

Change-Id: I6103509d902880d0e9c181873ec4cf56acf04424
Reviewed-by: Jake Petroules's avatarJake Petroules <jake.petroules@qt.io>
parent 44f53439
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "defaultpropertyprovider.h" #include "defaultpropertyprovider.h"
#include "qbsconstants.h" #include "qbsprojectmanagerconstants.h"
#include <coreplugin/messagemanager.h> #include <coreplugin/messagemanager.h>
#include <projectexplorer/abi.h> #include <projectexplorer/abi.h>
......
/****************************************************************************
**
** 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.
**
****************************************************************************/
#pragma once
namespace QbsProjectManager {
namespace Constants {
// Toolchain related settings:
const char QBS_TARGETOS[] = "qbs.targetOS";
const char QBS_SYSROOT[] = "qbs.sysroot";
const char QBS_ARCHITECTURE[] = "qbs.architecture";
const char QBS_TOOLCHAIN[] = "qbs.toolchain";
const char CPP_TOOLCHAINPATH[] = "cpp.toolchainInstallPath";
const char CPP_TOOLCHAINPREFIX[] = "cpp.toolchainPrefix";
const char CPP_COMPILERNAME[] = "cpp.compilerName";
const char CPP_CXXCOMPILERNAME[] = "cpp.cxxCompilerName";
const char CPP_PLATFORMCOMMONCOMPILERFLAGS[] = "cpp.platformCommonCompilerFlags";
const char CPP_PLATFORMLINKERFLAGS[] = "cpp.platformLinkerFlags";
const char CPP_PLATFORMPATH[] = "cpp.platformPath";
const char CPP_XCODESDKNAME[] = "cpp.xcodeSdkName";
const char CPP_XCODESDKVERSION[] = "cpp.xcodeSdkVersion";
// Settings page
const char QBS_SETTINGS_CATEGORY[] = "YM.qbs";
const char QBS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("QbsProjectManager", "Qbs");
const char QBS_SETTINGS_CATEGORY_ICON[] = ":/projectexplorer/images/build.png";
const char QBS_PROPERTIES_KEY_FOR_KITS[] = "QbsProjectManager.qbs-properties";
} // namespace Constants
} // namespace QbsProjectManager
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
#include "qbsinfopage.h" #include "qbsinfopage.h"
#include "ui_qbsinfowidget.h" #include "ui_qbsinfowidget.h"
#include "qbsconstants.h" #include "qbsprojectmanagerconstants.h"
#include <qbs.h> #include <qbs.h>
......
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
#include "ui_qbsprofilessettingswidget.h" #include "ui_qbsprofilessettingswidget.h"
#include "customqbspropertiesdialog.h" #include "customqbspropertiesdialog.h"
#include "qbsconstants.h"
#include "qbsprojectmanager.h" #include "qbsprojectmanager.h"
#include "qbsprojectmanagerconstants.h"
#include "qbsprojectmanagersettings.h" #include "qbsprojectmanagersettings.h"
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
......
...@@ -41,8 +41,7 @@ HEADERS = \ ...@@ -41,8 +41,7 @@ HEADERS = \
qbsprojectmanagerplugin.h \ qbsprojectmanagerplugin.h \
qbsprojectmanagersettings.h \ qbsprojectmanagersettings.h \
qbsprojectparser.h \ qbsprojectparser.h \
qbsrunconfiguration.h \ qbsrunconfiguration.h
qbsconstants.h
SOURCES = \ SOURCES = \
customqbspropertiesdialog.cpp \ customqbspropertiesdialog.cpp \
......
...@@ -75,7 +75,6 @@ QtcPlugin { ...@@ -75,7 +75,6 @@ QtcPlugin {
"qbscleanstep.cpp", "qbscleanstep.cpp",
"qbscleanstep.h", "qbscleanstep.h",
"qbscleanstepconfigwidget.ui", "qbscleanstepconfigwidget.ui",
"qbsconstants.h",
"qbsdeployconfigurationfactory.cpp", "qbsdeployconfigurationfactory.cpp",
"qbsdeployconfigurationfactory.h", "qbsdeployconfigurationfactory.h",
"qbsinfopage.cpp", "qbsinfopage.cpp",
......
...@@ -65,6 +65,28 @@ const char QBS_FORCE_PROBES_KEY[] = "qbspm.forceProbes"; ...@@ -65,6 +65,28 @@ const char QBS_FORCE_PROBES_KEY[] = "qbspm.forceProbes";
static const char QBS_GROUP_ICON[] = ":/qbsprojectmanager/images/groups.png"; static const char QBS_GROUP_ICON[] = ":/qbsprojectmanager/images/groups.png";
static const char QBS_PRODUCT_OVERLAY_ICON[] = ":/qbsprojectmanager/images/productgear.png"; static const char QBS_PRODUCT_OVERLAY_ICON[] = ":/qbsprojectmanager/images/productgear.png";
// Toolchain related settings:
const char QBS_TARGETOS[] = "qbs.targetOS";
const char QBS_SYSROOT[] = "qbs.sysroot";
const char QBS_ARCHITECTURE[] = "qbs.architecture";
const char QBS_TOOLCHAIN[] = "qbs.toolchain";
const char CPP_TOOLCHAINPATH[] = "cpp.toolchainInstallPath";
const char CPP_TOOLCHAINPREFIX[] = "cpp.toolchainPrefix";
const char CPP_COMPILERNAME[] = "cpp.compilerName";
const char CPP_CXXCOMPILERNAME[] = "cpp.cxxCompilerName";
const char CPP_PLATFORMCOMMONCOMPILERFLAGS[] = "cpp.platformCommonCompilerFlags";
const char CPP_PLATFORMLINKERFLAGS[] = "cpp.platformLinkerFlags";
const char CPP_PLATFORMPATH[] = "cpp.platformPath";
const char CPP_XCODESDKNAME[] = "cpp.xcodeSdkName";
const char CPP_XCODESDKVERSION[] = "cpp.xcodeSdkVersion";
// Settings page
const char QBS_SETTINGS_CATEGORY[] = "YM.qbs";
const char QBS_SETTINGS_TR_CATEGORY[] = QT_TRANSLATE_NOOP("QbsProjectManager", "Qbs");
const char QBS_SETTINGS_CATEGORY_ICON[] = ":/projectexplorer/images/build.png";
const char QBS_PROPERTIES_KEY_FOR_KITS[] = "QbsProjectManager.qbs-properties";
const char QBS_PROFILING_ENV[] = "QTC_QBS_PROFILING"; const char QBS_PROFILING_ENV[] = "QTC_QBS_PROFILING";
} // namespace Constants } // namespace Constants
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment