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>
This commit is contained in:
parent
8a3847aab9
commit
287d2d7753
@ -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
|
||||
|
@ -20,7 +20,6 @@ SOURCES += \
|
||||
HEADERS += \
|
||||
qtconcurrent_global.h \
|
||||
qtconcurrentcompilertest.h \
|
||||
qtconcurrentexception.h \
|
||||
qtconcurrentfilter.h \
|
||||
qtconcurrentfilterkernel.h \
|
||||
qtconcurrentfunctionwrappers.h \
|
||||
|
@ -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
|
Loading…
Reference in New Issue
Block a user