diff options
author | Andrew O'Doherty <andrew.odoherty@qt.io> | 2018-10-25 17:09:59 +0200 |
---|---|---|
committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2018-11-05 11:30:13 +0000 |
commit | a4baa3c2e2a74e35a5e1dabb7c1cbbdfb6c48be9 (patch) | |
tree | d498df8cc0bc2b4d022e43d2a29e3547e90f0be4 | |
parent | 2a9bb9926d9e4515179b69d70bd579d778980058 (diff) |
Linux qmake compiler detection for qtknx not working
Running configuration tests...
Checking for Minimum compiler version... no
Done running configuration tests.
Configure summary:
Qt KNX:
Minimum compiler version detected ...... no
Task-number: QTBUG-67157
Change-Id: I3a12e8aea25a162c01f033880ca87c0c41c9a6e8
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
-rw-r--r-- | config.tests/compilerdetection/compilerdetection.pro | 9 | ||||
-rw-r--r-- | config.tests/compilerdetection/main.cpp | 69 | ||||
-rw-r--r-- | configure.json | 5 | ||||
-rw-r--r-- | qtknx.pro | 5 | ||||
-rw-r--r-- | src/knx/configure.json | 37 | ||||
-rw-r--r-- | src/knx/qtknxglobal.h | 1 | ||||
-rw-r--r-- | src/knx/qtknxglobal_p.h | 1 |
7 files changed, 0 insertions, 127 deletions
diff --git a/config.tests/compilerdetection/compilerdetection.pro b/config.tests/compilerdetection/compilerdetection.pro deleted file mode 100644 index 6f0c31f..0000000 --- a/config.tests/compilerdetection/compilerdetection.pro +++ /dev/null @@ -1,9 +0,0 @@ -TEMPLATE = app - -QT = - -CONFIG += qt -CONFIG += c++11 -CONFIG += console - -SOURCES += main.cpp diff --git a/config.tests/compilerdetection/main.cpp b/config.tests/compilerdetection/main.cpp deleted file mode 100644 index cc96216..0000000 --- a/config.tests/compilerdetection/main.cpp +++ /dev/null @@ -1,69 +0,0 @@ -/****************************************************************************** -** -** Copyright (C) 2017 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$ -** -******************************************************************************/ - -#include <QtCore/qglobal.h> - -#ifndef Q_QDOC -# if !defined(Q_OS_WIN) -# if defined(Q_CC_CLANG) -# if defined(__apple_build_version__) -# if __apple_build_version__ == 8020041 -# error "Apple LLVM version 8.1.0 (clang-802.0.41)" -# endif -# endif -# elif defined(Q_CC_GNU) -# if Q_CC_GNU < 409 -# error "GCC version less than 4.9.0" -# endif -# endif -# else -# if defined(Q_CC_MSVC) -# if Q_CC_MSVC < 1900 -# error "Visual C++ compiler less than version 19." -# endif -# endif -# endif - -struct ConstExpr -{ - static constexpr const quint16 DefaultPort = 3671; - static constexpr const char *MulticastAddress = "224.0.23.12"; -}; -#endif - -int main(int /*argc*/, char** /*argv*/) -{ -#ifndef Q_QDOC - auto port = ConstExpr::DefaultPort; - Q_UNUSED(port) - auto address = ConstExpr::MulticastAddress; - Q_UNUSED(address) -#endif - - return 0; -} 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" - ] -} @@ -5,8 +5,3 @@ requires(!integrity) load(configure) load(qt_parts) - -include($$OUT_PWD/src/knx/qtknx-config.pri) -QT_FOR_CONFIG += knx-private - -requires(qtConfig(compilerdetection)) diff --git a/src/knx/configure.json b/src/knx/configure.json deleted file mode 100644 index 40a07df..0000000 --- a/src/knx/configure.json +++ /dev/null @@ -1,37 +0,0 @@ -{ - "module": "knx", - "testDir": "../../config.tests", - - "tests": { - "compilerdetection": { - "label": "Minimum compiler version", - "type": "compile", - "test": "compilerdetection" - } - }, - - "features": { - "compilerdetection": { - "label": "Minimum compiler version detected", - "condition": "tests.compilerdetection", - "output": [ "privateFeature" ] - } - }, - - "report": [ - { - "type": "note", - "condition": "!features.compilerdetection", - "message": "QtKnx: Your compiler is not officially supported or was not detected properly." - } - ], - - "summary": [ - { - "section": "Qt KNX", - "entries": [ - "compilerdetection" - ] - } - ] -} diff --git a/src/knx/qtknxglobal.h b/src/knx/qtknxglobal.h index a37dfbe..49203ca 100644 --- a/src/knx/qtknxglobal.h +++ b/src/knx/qtknxglobal.h @@ -31,7 +31,6 @@ #define QTKNXGLOBAL_H #include <QtCore/qglobal.h> -#include <QtKnx/qtknx-config.h> QT_BEGIN_NAMESPACE diff --git a/src/knx/qtknxglobal_p.h b/src/knx/qtknxglobal_p.h index c426607..cbe5954 100644 --- a/src/knx/qtknxglobal_p.h +++ b/src/knx/qtknxglobal_p.h @@ -43,6 +43,5 @@ #include <QtKnx/qtknxglobal.h> #include <QtCore/private/qglobal_p.h> -#include <QtKnx/private/qtknx-config_p.h> #endif |