From 9bdc3380561813afea0898a0d3d39c0c9b39f4e9 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Fri, 30 Sep 2022 14:01:29 +0200 Subject: [PATCH] Move qt_noop() into a separate header This was the last function left in qglobal.h. Task-number: QTBUG-106154 Task-number: QTBUG-99313 Change-Id: I6b16744b2811b7ca9837742610d72b85da7c76b2 Reviewed-by: Thiago Macieira --- src/corelib/CMakeLists.txt | 1 + src/corelib/global/qglobal.h | 2 +- src/corelib/global/qtnoop.h | 13 +++++++++++++ 3 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 src/corelib/global/qtnoop.h diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt index ba155c4e9b..bf270c4941 100644 --- a/src/corelib/CMakeLists.txt +++ b/src/corelib/CMakeLists.txt @@ -81,6 +81,7 @@ qt_internal_add_module(Core global/qtconfigmacros.h global/qtdeprecationmarkers.h global/qtenvironmentvariables.cpp global/qtenvironmentvariables.h + global/qtnoop.h global/qtpreprocessorsupport.h global/qtrace_p.h global/qtresource.h diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index e36d64d161..f78d7e9445 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -27,7 +27,7 @@ #include -inline void qt_noop(void) {} +#include #include #include diff --git a/src/corelib/global/qtnoop.h b/src/corelib/global/qtnoop.h new file mode 100644 index 0000000000..ea0cedd9bc --- /dev/null +++ b/src/corelib/global/qtnoop.h @@ -0,0 +1,13 @@ +// Copyright (C) 2022 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 QTNOOP_H +#define QTNOOP_H + +#if 0 +#pragma qt_sync_stop_processing +#endif + +inline void qt_noop(void) {} + +#endif // QTNOOP_H