diff options
author | Marc Mutz <marc.mutz@qt.io> | 2022-05-09 15:40:41 +0200 |
---|---|---|
committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-05-10 23:35:34 +0000 |
commit | ad54ec80240dd0a3c010d15ca40729ba33105720 (patch) | |
tree | 909b656c0c27a1ec18059d7a6b45e958c477b375 /src/quickcontrols2impl | |
parent | a7106b2b8a73e190caf01ab0e0c15887113a20d5 (diff) |
Add TUs for QML_FOREIGNs and namespaces to enable includemocs
There is never any implementation of QML_FOREIGN Q_GADGETs, or
Q_ENUMs, so just compiling their moc-files in mocs_compilation.cpp
would be fine. But at some point we want automoc to throw an error
when mocs_compilation.cpp isn't empty, so add TUs nonetheless.
Task-number: QTBUG-102948
Change-Id: Ie4167badc730e09d51429c961915da5990c7b51a
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
(cherry picked from commit 6738fe1ee736835251d8c2fb06bdae54e7087edb)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/quickcontrols2impl')
-rw-r--r-- | src/quickcontrols2impl/CMakeLists.txt | 2 | ||||
-rw-r--r-- | src/quickcontrols2impl/qtquickcontrols2foreign.cpp | 46 |
2 files changed, 47 insertions, 1 deletions
diff --git a/src/quickcontrols2impl/CMakeLists.txt b/src/quickcontrols2impl/CMakeLists.txt index c2b97c4e15..a5baf1f4d8 100644 --- a/src/quickcontrols2impl/CMakeLists.txt +++ b/src/quickcontrols2impl/CMakeLists.txt @@ -25,7 +25,7 @@ qt_internal_add_qml_module(QuickControls2Impl qquickpaddedrectangle.cpp qquickpaddedrectangle_p.h qquickplaceholdertext.cpp qquickplaceholdertext_p.h qquickplatformtheme.cpp qquickplatformtheme_p.h - qtquickcontrols2foreign_p.h + qtquickcontrols2foreign.cpp qtquickcontrols2foreign_p.h qtquickcontrols2implglobal_p.h DEFINES QT_NO_CAST_FROM_ASCII diff --git a/src/quickcontrols2impl/qtquickcontrols2foreign.cpp b/src/quickcontrols2impl/qtquickcontrols2foreign.cpp new file mode 100644 index 0000000000..32f1678006 --- /dev/null +++ b/src/quickcontrols2impl/qtquickcontrols2foreign.cpp @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** Copyright (C) 2022 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the Qt Quick Controls 2 module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** 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 Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** 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-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qtquickcontrols2foreign_p.h" + +QT_BEGIN_NAMESPACE + +QT_END_NAMESPACE + +#include "moc_qtquickcontrols2foreign_p.cpp" |