aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2018-04-08 23:42:59 +0300
committerOrgad Shaneh <orgads@gmail.com>2018-04-09 09:04:13 +0000
commiteea6a7c3b3920187d3367c2b3d20c1d74b6eafcd (patch)
treec73167240f8f2cb8e05bfbd2da0711eedd0aec7f /src/libs
parent7d3a79c696a966877b5bde32730b70310d34afdc (diff)
Utils: Purge qtcfallthrough.h
No longer needed. Change-Id: I9b0bee014df89d4c567f1d2431b5ff9404f5f925 Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/libs')
-rw-r--r--src/libs/3rdparty/cplusplus/Parser.cpp2
-rw-r--r--src/libs/qmljs/parser/qmljslexer.cpp2
-rw-r--r--src/libs/qmljs/qmljscodeformatter.cpp2
-rw-r--r--src/libs/qmljs/qmljsevaluate.cpp2
-rw-r--r--src/libs/qmljs/qmljsmodelmanagerinterface.cpp1
-rw-r--r--src/libs/utils/qtcfallthrough.h54
-rw-r--r--src/libs/utils/utils-lib.pri1
-rw-r--r--src/libs/utils/utils.qbs1
8 files changed, 0 insertions, 65 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp
index 81d90e7dfb..250576edcf 100644
--- a/src/libs/3rdparty/cplusplus/Parser.cpp
+++ b/src/libs/3rdparty/cplusplus/Parser.cpp
@@ -27,8 +27,6 @@
#include "ObjectiveCTypeQualifiers.h"
#include "QtContextKeywords.h"
-#include <utils/qtcfallthrough.h>
-
#include <unordered_map>
#include <utility>
diff --git a/src/libs/qmljs/parser/qmljslexer.cpp b/src/libs/qmljs/parser/qmljslexer.cpp
index 0e0a57f7a2..4b9d4e3c82 100644
--- a/src/libs/qmljs/parser/qmljslexer.cpp
+++ b/src/libs/qmljs/parser/qmljslexer.cpp
@@ -32,8 +32,6 @@
#include <QtCore/qvarlengtharray.h>
#include <QtCore/qdebug.h>
-#include <utils/qtcfallthrough.h>
-
QT_BEGIN_NAMESPACE
Q_CORE_EXPORT double qstrtod(const char *s00, char const **se, bool *ok);
QT_END_NAMESPACE
diff --git a/src/libs/qmljs/qmljscodeformatter.cpp b/src/libs/qmljs/qmljscodeformatter.cpp
index 70c1709406..8c34cdc4ac 100644
--- a/src/libs/qmljs/qmljscodeformatter.cpp
+++ b/src/libs/qmljs/qmljscodeformatter.cpp
@@ -30,8 +30,6 @@
#include <QTextBlock>
#include <QTextDocument>
-#include <utils/qtcfallthrough.h>
-
static Q_LOGGING_CATEGORY(formatterLog, "qtc.qmljs.formatter")
namespace QmlJS {
diff --git a/src/libs/qmljs/qmljsevaluate.cpp b/src/libs/qmljs/qmljsevaluate.cpp
index 44414e27b9..26ba2e56b5 100644
--- a/src/libs/qmljs/qmljsevaluate.cpp
+++ b/src/libs/qmljs/qmljsevaluate.cpp
@@ -29,8 +29,6 @@
#include "qmljsvalueowner.h"
#include "parser/qmljsast_p.h"
-#include <utils/qtcfallthrough.h>
-
using namespace QmlJS;
/*!
diff --git a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
index 79ae1d59e9..95fc125d7c 100644
--- a/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
+++ b/src/libs/qmljs/qmljsmodelmanagerinterface.cpp
@@ -37,7 +37,6 @@
#include <cplusplus/cppmodelmanagerbase.h>
#include <utils/algorithm.h>
#include <utils/hostosinfo.h>
-#include <utils/qtcfallthrough.h>
#include <utils/runextensions.h>
#include <QDir>
diff --git a/src/libs/utils/qtcfallthrough.h b/src/libs/utils/qtcfallthrough.h
deleted file mode 100644
index 6eba622837..0000000000
--- a/src/libs/utils/qtcfallthrough.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2017 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
-
-#include <QtGlobal>
-
-#ifndef Q_FALLTHROUGH
-#ifndef QT_HAS_CPP_ATTRIBUTE
-#ifdef __has_cpp_attribute
-# define QT_HAS_CPP_ATTRIBUTE(x) __has_cpp_attribute(x)
-#else
-# define QT_HAS_CPP_ATTRIBUTE(x) 0
-#endif
-#endif
-#if defined(__cplusplus)
-#if QT_HAS_CPP_ATTRIBUTE(fallthrough)
-# define Q_FALLTHROUGH() [[fallthrough]]
-#elif QT_HAS_CPP_ATTRIBUTE(clang::fallthrough)
-# define Q_FALLTHROUGH() [[clang::fallthrough]]
-#elif QT_HAS_CPP_ATTRIBUTE(gnu::fallthrough)
-# define Q_FALLTHROUGH() [[gnu::fallthrough]]
-#endif
-#endif
-#ifndef Q_FALLTHROUGH
-# if (defined(Q_CC_GNU) && Q_CC_GNU >= 700) && !defined(Q_CC_INTEL)
-# define Q_FALLTHROUGH() __attribute__((fallthrough))
-# else
-# define Q_FALLTHROUGH() (void)0
-#endif
-#endif
-#endif
diff --git a/src/libs/utils/utils-lib.pri b/src/libs/utils/utils-lib.pri
index b554674c33..7de656218b 100644
--- a/src/libs/utils/utils-lib.pri
+++ b/src/libs/utils/utils-lib.pri
@@ -249,7 +249,6 @@ HEADERS += \
$$PWD/../3rdparty/optional/optional.hpp \
$$PWD/variant.h \
$$PWD/../3rdparty/variant/variant.hpp \
- $$PWD/qtcfallthrough.h \
$$PWD/highlightingitemdelegate.h \
$$PWD/fuzzymatcher.h \
$$PWD/textutils.h \
diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs
index a8ceaffc82..d6f02202e9 100644
--- a/src/libs/utils/utils.qbs
+++ b/src/libs/utils/utils.qbs
@@ -183,7 +183,6 @@ Project {
"proxycredentialsdialog.cpp",
"proxycredentialsdialog.h",
"proxycredentialsdialog.ui",
- "qtcfallthrough.h",
"qtcassert.cpp",
"qtcassert.h",
"qtcolorbutton.cpp",