summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-24 03:01:24 +0200
committerQt Forward Merge Bot <qt_forward_merge_bot@qt-project.org>2019-08-24 03:01:24 +0200
commitdb5341debcd9342e2196ec70816aca0ba6e93468 (patch)
treed928b59496e496507b3f63781851a45001c14ded
parent99dd0e8203d789caf2edfd2105c398654f5b5748 (diff)
parent397d83275c7f5bf417e70bcbb5b66097dbf03083 (diff)
Merge remote-tracking branch 'origin/5.13' into dev
-rw-r--r--config.tests/compiletest/compiletest.pro8
-rw-r--r--config.tests/compiletest/main.cpp32
-rw-r--r--config.tests/compiletest/main_less_5.cpp32
-rw-r--r--configure.json5
-rw-r--r--qtknx.pro5
-rw-r--r--src/knx/configure.json37
6 files changed, 119 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 */
+}
diff --git a/configure.json b/configure.json
new file mode 100644
index 0000000..78a1945
--- /dev/null
+++ b/configure.json
@@ -0,0 +1,5 @@
+{
+ "subconfigs": [
+ "src/knx"
+ ]
+}
diff --git a/qtknx.pro b/qtknx.pro
index 118b159..db1bea4 100644
--- a/qtknx.pro
+++ b/qtknx.pro
@@ -6,3 +6,8 @@ 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
new file mode 100644
index 0000000..92c66b0
--- /dev/null
+++ b/src/knx/configure.json
@@ -0,0 +1,37 @@
+{
+ "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"
+ ]
+ }
+ ]
+}