diff --git a/src/plugins/clangcodemodel/clang_global.h b/src/plugins/clangcodemodel/clang_global.h deleted file mode 100644 index 2f0faa7fc1c..00000000000 --- a/src/plugins/clangcodemodel/clang_global.h +++ /dev/null @@ -1,43 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://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 http://www.qt.io/terms-conditions. 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, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -****************************************************************************/ - -#ifndef CLANG_GLOBAL_H -#define CLANG_GLOBAL_H - -#include - -#if defined(CLANGCODEMODEL_LIBRARY) -# define CLANG_EXPORT Q_DECL_EXPORT -#else -# define CLANG_EXPORT Q_DECL_IMPORT -#endif - - -#endif // CLANG_GLOBAL_H diff --git a/src/plugins/clangcodemodel/clangcodemodel.pro b/src/plugins/clangcodemodel/clangcodemodel.pro index ab5e8597a85..181ac8a0b3a 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.pro +++ b/src/plugins/clangcodemodel/clangcodemodel.pro @@ -1,8 +1,6 @@ include(../../qtcreatorplugin.pri) include(../../shared/clang/clang_installation.pri) -DEFINES += CLANGCODEMODEL_LIBRARY - # The following defines are used to determine the clang include path for intrinsics. DEFINES += CLANG_VERSION=\\\"$${LLVM_VERSION}\\\" DEFINES += "\"CLANG_RESOURCE_DIR=\\\"$${LLVM_LIBDIR}/clang/$${LLVM_VERSION}/include\\\"\"" @@ -53,7 +51,6 @@ HEADERS += \ clangfixitoperation.h \ clangfixitoperationsextractor.h \ clangfunctionhintmodel.h \ - clang_global.h \ clangmodelmanagersupport.h \ clangprojectsettings.h \ clangprojectsettingspropertiespage.h \ diff --git a/src/plugins/clangcodemodel/clangcodemodel.qbs b/src/plugins/clangcodemodel/clangcodemodel.qbs index dc275e7ead8..cc734651edd 100644 --- a/src/plugins/clangcodemodel/clangcodemodel.qbs +++ b/src/plugins/clangcodemodel/clangcodemodel.qbs @@ -72,7 +72,6 @@ QtcPlugin { "clangfixitoperationsextractor.h", "clangfunctionhintmodel.cpp", "clangfunctionhintmodel.h", - "clang_global.h", "clangmodelmanagersupport.cpp", "clangmodelmanagersupport.h", "clangprojectsettings.cpp", diff --git a/src/plugins/clangcodemodel/clangprojectsettings.h b/src/plugins/clangcodemodel/clangprojectsettings.h index 1f38120b70e..a5956d33dfa 100644 --- a/src/plugins/clangcodemodel/clangprojectsettings.h +++ b/src/plugins/clangcodemodel/clangprojectsettings.h @@ -31,8 +31,6 @@ #ifndef CLANGPROJECTSETTINGS_H #define CLANGPROJECTSETTINGS_H -#include "clang_global.h" - #include #include @@ -40,7 +38,7 @@ namespace ClangCodeModel { -class CLANG_EXPORT ClangProjectSettings: public QObject +class ClangProjectSettings: public QObject { Q_OBJECT diff --git a/src/plugins/clangcodemodel/clangutils.h b/src/plugins/clangcodemodel/clangutils.h index 7590333a03b..7bce88179df 100644 --- a/src/plugins/clangcodemodel/clangutils.h +++ b/src/plugins/clangcodemodel/clangutils.h @@ -31,8 +31,6 @@ #ifndef CPPTOOLS_CLANGUTILS_H #define CPPTOOLS_CLANGUTILS_H -#include "clang_global.h" - #include #include diff --git a/src/plugins/clangcodemodel/highlightingmarksreporter.h b/src/plugins/clangcodemodel/highlightingmarksreporter.h index 5726ce0b58b..54ed8e3d2a9 100644 --- a/src/plugins/clangcodemodel/highlightingmarksreporter.h +++ b/src/plugins/clangcodemodel/highlightingmarksreporter.h @@ -31,8 +31,6 @@ #ifndef CLANGCODEMODEL_HIGHLIGHTINGMARKSREPORTER_H #define CLANGCODEMODEL_HIGHLIGHTINGMARKSREPORTER_H -#include "clang_global.h" - #include #include #include