diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:15:53 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-11-17 14:43:26 +0100 |
| commit | e5ac4afbf954a3e1616ce8543d46ddc668d0374f (patch) | |
| tree | be6d97001edebd5cb74c64aaf0010f3cc76a7293 /config.tests/unix/gstreamer/gstreamer.cpp | |
| parent | e3ed95dd44b95b6e9361b562807e711d7ce5a58b (diff) | |
| parent | 03c1a6ac717e3c5693653a5e294214056bda970e (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
mkspecs/features/mac/default_post.prf
mkspecs/features/uikit/default_post.prf
Change-Id: I2a6f783451f2ac9eb4c1a050f605435d2dacf218
Diffstat (limited to 'config.tests/unix/gstreamer/gstreamer.cpp')
| -rw-r--r-- | config.tests/unix/gstreamer/gstreamer.cpp | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/config.tests/unix/gstreamer/gstreamer.cpp b/config.tests/unix/gstreamer/gstreamer.cpp deleted file mode 100644 index 8076458b8b..0000000000 --- a/config.tests/unix/gstreamer/gstreamer.cpp +++ /dev/null @@ -1,47 +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$ -** -****************************************************************************/ - -#define GST_USE_UNSTABLE_API - -#include <gst/gst.h> - -int main(int, char**) -{ - return 0; -} |