diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-20 03:02:13 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-08-20 03:02:19 +0200 |
commit | 397d83275c7f5bf417e70bcbb5b66097dbf03083 (patch) | |
tree | 111ec0cc99fc32d22c4eee2e67e3b7e52fdf287c /config.tests | |
parent | 3bc0dfd9c2a59cb8abcbfa2fb8ea47e7fcdd626d (diff) | |
parent | 09d622b84fac63d9b872456aa43aa09854106500 (diff) |
Merge "Merge remote-tracking branch 'origin/5.12' into 5.13"
Diffstat (limited to 'config.tests')
-rw-r--r-- | config.tests/compiletest/compiletest.pro | 8 | ||||
-rw-r--r-- | config.tests/compiletest/main.cpp | 32 | ||||
-rw-r--r-- | config.tests/compiletest/main_less_5.cpp | 32 |
3 files changed, 72 insertions, 0 deletions
diff --git a/config.tests/compiletest/compiletest.pro b/config.tests/compiletest/compiletest.pro new file mode 100644 index 0000000..b4d29a1 --- /dev/null +++ b/config.tests/compiletest/compiletest.pro @@ -0,0 +1,8 @@ +gcc { + versionAtLeast(QT_GCC_MAJOR_VERSION, 5) \ + SOURCES += main.cpp + else: \ + SOURCES += main_less_5.cpp +} else { + SOURCES += main.cpp +} diff --git a/config.tests/compiletest/main.cpp b/config.tests/compiletest/main.cpp new file mode 100644 index 0000000..6afec07 --- /dev/null +++ b/config.tests/compiletest/main.cpp @@ -0,0 +1,32 @@ +/****************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtKnx module. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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. +** +** $QT_END_LICENSE$ +** +******************************************************************************/ + +int main(int /*argc*/, char** /*argv*/) +{ + return 0; +} diff --git a/config.tests/compiletest/main_less_5.cpp b/config.tests/compiletest/main_less_5.cpp new file mode 100644 index 0000000..f9bf68f --- /dev/null +++ b/config.tests/compiletest/main_less_5.cpp @@ -0,0 +1,32 @@ +/****************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the QtKnx module. +** +** $QT_BEGIN_LICENSE:GPL-EXCEPT$ +** 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. +** +** $QT_END_LICENSE$ +** +******************************************************************************/ + +int main(int /*argc*/, char** /*argv*/) +{ + return 0 /* forcibly broken compile test */ +} |