diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-01-31 14:37:11 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-02 12:52:19 +0000 |
| commit | dd4c9cbd405730b360cb6aed572006078d88cecb (patch) | |
| tree | 2258df243ae9d12918305aea8d3df014347eb6cd /src/multimedia | |
| parent | e5ee1e036eaecb91797cbe85ac7f8929145f3d65 (diff) | |
actually delete obsolete qmultimediadefs.h
defining a deprecated forwarding header leads to all kinds of
"interesting" effects when the header is actually still there.
amends 24a1c04b.
Task-number: QTBUG-58432
Change-Id: I4a32bd55fe7bd14e1aff2f3a6ca46439ce1510de
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/multimedia')
| -rw-r--r-- | src/multimedia/qtmultimediadefs.h | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/src/multimedia/qtmultimediadefs.h b/src/multimedia/qtmultimediadefs.h deleted file mode 100644 index f0042faf6..000000000 --- a/src/multimedia/qtmultimediadefs.h +++ /dev/null @@ -1,71 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part 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$ -** -****************************************************************************/ - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#ifndef QTMULTIMEDIA_P_H -#define QTMULTIMEDIA_P_H - -#include <QtCore/qglobal.h> - -QT_BEGIN_NAMESPACE - -#ifndef QT_STATIC -# if defined(QT_BUILD_MULTIMEDIA_LIB) -# define Q_MULTIMEDIA_EXPORT Q_DECL_EXPORT -# else -# define Q_MULTIMEDIA_EXPORT Q_DECL_IMPORT -# endif -#else -# define Q_MULTIMEDIA_EXPORT -#endif - -QT_END_NAMESPACE - -#endif // QMULTIMEDIA_P_H - |