summaryrefslogtreecommitdiffstats
path: root/src/concurrent
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-09-10 14:41:33 +0200
committerLars Knoll <lars.knoll@qt.io>2020-09-10 18:55:55 +0200
commit287d2d7753bf354fea3bbf4dfa6d2f9653ac98b7 (patch)
treeb656cbea906a2aa863cef4ebf2a8dd660e7a5c5a /src/concurrent
parent8a3847aab94577981593b9dd900fbd306b202ab6 (diff)
Get rid of qtconcurrentexception.h
It only contained two aliases that have been deprecated since 2012. Change-Id: I6f65aa5144aca2d8d99f8a6e586b805f685afad2 Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/concurrent')
-rw-r--r--src/concurrent/CMakeLists.txt1
-rw-r--r--src/concurrent/concurrent.pro1
-rw-r--r--src/concurrent/qtconcurrentexception.h65
3 files changed, 0 insertions, 67 deletions
diff --git a/src/concurrent/CMakeLists.txt b/src/concurrent/CMakeLists.txt
index 23208b253e..7422446040 100644
--- a/src/concurrent/CMakeLists.txt
+++ b/src/concurrent/CMakeLists.txt
@@ -10,7 +10,6 @@ qt_add_module(Concurrent
qtaskbuilder.h
qtconcurrent_global.h
qtconcurrentcompilertest.h
- qtconcurrentexception.h
qtconcurrentfilter.cpp qtconcurrentfilter.h
qtconcurrentfilterkernel.h
qtconcurrentfunctionwrappers.h
diff --git a/src/concurrent/concurrent.pro b/src/concurrent/concurrent.pro
index 6e9b22d2e4..21c33e4c99 100644
--- a/src/concurrent/concurrent.pro
+++ b/src/concurrent/concurrent.pro
@@ -20,7 +20,6 @@ SOURCES += \
HEADERS += \
qtconcurrent_global.h \
qtconcurrentcompilertest.h \
- qtconcurrentexception.h \
qtconcurrentfilter.h \
qtconcurrentfilterkernel.h \
qtconcurrentfunctionwrappers.h \
diff --git a/src/concurrent/qtconcurrentexception.h b/src/concurrent/qtconcurrentexception.h
deleted file mode 100644
index 8a3986a1a3..0000000000
--- a/src/concurrent/qtconcurrentexception.h
+++ /dev/null
@@ -1,65 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the QtConcurrent module of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** 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 Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 included in the
-** packaging of this file. Please review the following information to
-** ensure the GNU Lesser General Public License version 3 requirements
-** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** 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-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef QTCONCURRENT_EXCEPTION_H
-#define QTCONCURRENT_EXCEPTION_H
-
-#include <QtConcurrent/qtconcurrent_global.h>
-#include <QtCore/qexception.h>
-
-QT_REQUIRE_CONFIG(concurrent);
-
-QT_BEGIN_NAMESPACE
-
-
-namespace QtConcurrent
-{
-
-#if !defined(QT_NO_EXCEPTIONS) || defined(Q_CLANG_QDOC)
-
-typedef Q_DECL_DEPRECATED QException Exception;
-typedef Q_DECL_DEPRECATED QUnhandledException UnhandledException;
-
-#endif
-
-} // namespace QtConcurrent
-
-QT_END_NAMESPACE
-
-#endif