diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-01 13:04:26 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-02-02 09:03:50 +0100 |
| commit | 3adfac4a7ae2d55ac64b39cd80c876826abb08c5 (patch) | |
| tree | 9c2fe5f5b027e3dc7b54b463588cb78234a01c7d | |
| parent | 97917e5bb1162bf51a17d15b0d765ab77bd975b9 (diff) | |
Fix CMake Unity (Jumbo) builds
Add missing header guards and exclude problematic source file.
Pick-to: 6.5
Task-number: QTBUG-109394
Change-Id: I170824448de8b030b444ce9a5d9b15eeca145a22
Reviewed-by: Amir Masoud Abdol <amir.abdol@qt.io>
Reviewed-by: Frank Meerkoetter <frank.meerkoetter@basyskom.com>
| -rw-r--r-- | src/plugins/opcua/open62541/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/plugins/opcua/open62541/qopen62541backend.h | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/plugins/opcua/open62541/CMakeLists.txt b/src/plugins/opcua/open62541/CMakeLists.txt index dc26a5c..979ca49 100644 --- a/src/plugins/opcua/open62541/CMakeLists.txt +++ b/src/plugins/opcua/open62541/CMakeLists.txt @@ -43,6 +43,10 @@ qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_open62541 AND NO ../../../3rdparty/open62541 ) +set_source_files_properties(QOpen62541Plugin + qopen62541valueconverter.cpp + PROPERTIES SKIP_UNITY_BUILD_INCLUSION ON) + # special case begin #qt_internal_extend_target(QOpen62541Plugin CONDITION QT_FEATURE_mbedtls AND QT_FEATURE_open62541 AND NOT QT_FEATURE_system_open62541 # DEFINES diff --git a/src/plugins/opcua/open62541/qopen62541backend.h b/src/plugins/opcua/open62541/qopen62541backend.h index b4955bb..cf5c7c1 100644 --- a/src/plugins/opcua/open62541/qopen62541backend.h +++ b/src/plugins/opcua/open62541/qopen62541backend.h @@ -1,6 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +#ifndef QOPEN62541BACKEND_H +#define QOPEN62541BACKEND_H + #include "qopen62541client.h" #include "qopen62541subscription.h" #include <private/qopcuabackend_p.h> @@ -186,3 +189,5 @@ private: }; QT_END_NAMESPACE + +#endif // QOPEN62541BACKEND_H |