From a0014eeb418c5eb71c1e087d4c3932353b625e99 Mon Sep 17 00:00:00 2001 From: Karsten Heimrich Date: Wed, 28 Aug 2019 12:01:12 +0200 Subject: Revert "Fix compile error after we added SLES_12" This reverts commit 29d53975d559c9d2acce78167bacbe384e2d825a. A parent commit introduced a compilation fix that makes this patchset superfluous. Enables the SLES12 target. Change-Id: Ie66b6400956f5a918b031d9007f6df276c331750 Reviewed-by: Alex Blasche --- config.tests/compiletest/compiletest.pro | 8 ------- config.tests/compiletest/main.cpp | 32 --------------------------- config.tests/compiletest/main_less_5.cpp | 32 --------------------------- configure.json | 5 ----- qtknx.pro | 5 ----- src/knx/configure.json | 37 -------------------------------- 6 files changed, 119 deletions(-) delete mode 100644 config.tests/compiletest/compiletest.pro delete mode 100644 config.tests/compiletest/main.cpp delete mode 100644 config.tests/compiletest/main_less_5.cpp delete mode 100644 configure.json delete mode 100644 src/knx/configure.json diff --git a/config.tests/compiletest/compiletest.pro b/config.tests/compiletest/compiletest.pro deleted file mode 100644 index b4d29a1..0000000 --- a/config.tests/compiletest/compiletest.pro +++ /dev/null @@ -1,8 +0,0 @@ -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 deleted file mode 100644 index 6afec07..0000000 --- a/config.tests/compiletest/main.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/****************************************************************************** -** -** 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 deleted file mode 100644 index f9bf68f..0000000 --- a/config.tests/compiletest/main_less_5.cpp +++ /dev/null @@ -1,32 +0,0 @@ -/****************************************************************************** -** -** 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 */ -} diff --git a/configure.json b/configure.json deleted file mode 100644 index 78a1945..0000000 --- a/configure.json +++ /dev/null @@ -1,5 +0,0 @@ -{ - "subconfigs": [ - "src/knx" - ] -} diff --git a/qtknx.pro b/qtknx.pro index db1bea4..118b159 100644 --- a/qtknx.pro +++ b/qtknx.pro @@ -6,8 +6,3 @@ requires(!integrity) load(configure) load(qt_parts) - -include($$OUT_PWD/src/knx/qtknx-config.pri) -QT_FOR_CONFIG += knx-private - -requires(qtConfig(compiletest)) diff --git a/src/knx/configure.json b/src/knx/configure.json deleted file mode 100644 index 92c66b0..0000000 --- a/src/knx/configure.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "module": "knx", - "testDir": "../../config.tests", - - "tests": { - "compiletest": { - "label": "Minimum compiler version", - "type": "compile", - "test": "compiletest" - } - }, - - "features": { - "compiletest": { - "label": "Minimum compiler version detected", - "condition": "tests.compiletest", - "output": [ "privateFeature" ] - } - }, - - "report": [ - { - "type": "note", - "condition": "!features.compiletest", - "message": "QtKnx: Your compiler is not officially supported or was not detected properly." - } - ], - - "summary": [ - { - "section": "Qt KNX", - "entries": [ - "compiletest" - ] - } - ] -} -- cgit v1.2.3