aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Mutz <marc.mutz@qt.io>2022-05-09 15:40:41 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-05-10 23:35:34 +0000
commitad54ec80240dd0a3c010d15ca40729ba33105720 (patch)
tree909b656c0c27a1ec18059d7a6b45e958c477b375
parenta7106b2b8a73e190caf01ab0e0c15887113a20d5 (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>
-rw-r--r--src/qmldom/CMakeLists.txt2
-rw-r--r--src/qmldom/qqmldomconstants.cpp49
-rw-r--r--src/qmlmodels/CMakeLists.txt2
-rw-r--r--src/qmlmodels/qqmlmodelsmodule.cpp48
-rw-r--r--src/quick/CMakeLists.txt2
-rw-r--r--src/quick/util/qquickforeignutils.cpp46
-rw-r--r--src/quickcontrols2impl/CMakeLists.txt2
-rw-r--r--src/quickcontrols2impl/qtquickcontrols2foreign.cpp46
-rw-r--r--src/quickdialogs2/quickdialogs2/CMakeLists.txt1
-rw-r--r--src/quickdialogs2/quickdialogs2/qtquickdialogs2foreign.cpp46
-rw-r--r--src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt1
-rw-r--r--src/quickdialogs2/quickdialogs2quickimpl/qtquickdialogs2quickimplforeign.cpp46
12 files changed, 287 insertions, 4 deletions
diff --git a/src/qmldom/CMakeLists.txt b/src/qmldom/CMakeLists.txt
index 3dedf45e4f..a5e8837a66 100644
--- a/src/qmldom/CMakeLists.txt
+++ b/src/qmldom/CMakeLists.txt
@@ -16,7 +16,7 @@ qt_internal_add_module(QmlDomPrivate
qqmldomattachedinfo.cpp qqmldomattachedinfo_p.h
qqmldomcomments.cpp qqmldomcomments_p.h
qqmldomcompare.cpp qqmldomcompare_p.h
- qqmldomconstants_p.h
+ qqmldomconstants.cpp qqmldomconstants_p.h
qqmldomelements.cpp qqmldomelements_p.h
qqmldomerrormessage.cpp qqmldomerrormessage_p.h
qqmldomexternalitems.cpp qqmldomexternalitems_p.h
diff --git a/src/qmldom/qqmldomconstants.cpp b/src/qmldom/qqmldomconstants.cpp
new file mode 100644
index 0000000000..60bf6aaa78
--- /dev/null
+++ b/src/qmldom/qqmldomconstants.cpp
@@ -0,0 +1,49 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml 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 "qqmldomconstants_p.h"
+
+QT_BEGIN_NAMESPACE
+
+namespace QQmlJS::Dom {
+
+} // end namespace QQmlJS::Dom
+
+QT_END_NAMESPACE
+
+#include "moc_qqmldomconstants_p.cpp"
diff --git a/src/qmlmodels/CMakeLists.txt b/src/qmlmodels/CMakeLists.txt
index 1f8ffcdadf..c12ea17ec3 100644
--- a/src/qmlmodels/CMakeLists.txt
+++ b/src/qmlmodels/CMakeLists.txt
@@ -10,7 +10,7 @@ qt_internal_add_qml_module(QmlModels
CLASS_NAME QtQmlModelsPlugin
SOURCES
qqmlchangeset.cpp qqmlchangeset_p.h
- qqmlmodelsmodule_p.h
+ qqmlmodelsmodule.cpp qqmlmodelsmodule_p.h
qtqmlmodelsglobal.h qtqmlmodelsglobal_p.h
DEFINES
QT_NO_FOREACH
diff --git a/src/qmlmodels/qqmlmodelsmodule.cpp b/src/qmlmodels/qqmlmodelsmodule.cpp
new file mode 100644
index 0000000000..9f795b4d3f
--- /dev/null
+++ b/src/qmlmodels/qqmlmodelsmodule.cpp
@@ -0,0 +1,48 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQml 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 "qqmlmodelsmodule_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QT_END_NAMESPACE
+
+#if QT_CONFIG(itemmodel)
+#include "moc_qqmlmodelsmodule_p.cpp"
+#endif
diff --git a/src/quick/CMakeLists.txt b/src/quick/CMakeLists.txt
index e996cff237..c6a413d733 100644
--- a/src/quick/CMakeLists.txt
+++ b/src/quick/CMakeLists.txt
@@ -177,7 +177,7 @@ qt_internal_add_qml_module(Quick
util/qquickdeliveryagent.cpp util/qquickdeliveryagent_p.h util/qquickdeliveryagent_p_p.h
util/qquickfontloader.cpp util/qquickfontloader_p.h
util/qquickfontmetrics.cpp util/qquickfontmetrics_p.h
- util/qquickforeignutils_p.h
+ util/qquickforeignutils.cpp util/qquickforeignutils_p.h
util/qquickglobal.cpp
util/qquickimageprovider.cpp util/qquickimageprovider.h util/qquickimageprovider_p.h
util/qquickpixmapcache.cpp util/qquickpixmapcache_p.h
diff --git a/src/quick/util/qquickforeignutils.cpp b/src/quick/util/qquickforeignutils.cpp
new file mode 100644
index 0000000000..824a2c293e
--- /dev/null
+++ b/src/quick/util/qquickforeignutils.cpp
@@ -0,0 +1,46 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the QtQuick 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 "qquickforeignutils_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QT_END_NAMESPACE
+
+#include "moc_qquickforeignutils_p.cpp"
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"
diff --git a/src/quickdialogs2/quickdialogs2/CMakeLists.txt b/src/quickdialogs2/quickdialogs2/CMakeLists.txt
index 1dd9c35829..7812ebb818 100644
--- a/src/quickdialogs2/quickdialogs2/CMakeLists.txt
+++ b/src/quickdialogs2/quickdialogs2/CMakeLists.txt
@@ -18,6 +18,7 @@ qt_internal_add_qml_module(QuickDialogs2
qquickfolderdialog_p.h
qquickfontdialog.cpp
qquickfontdialog_p.h
+ qtquickdialogs2foreign.cpp
qtquickdialogs2foreign_p.h
qtquickdialogs2global_p.h
qquickmessagedialog_p.h
diff --git a/src/quickdialogs2/quickdialogs2/qtquickdialogs2foreign.cpp b/src/quickdialogs2/quickdialogs2/qtquickdialogs2foreign.cpp
new file mode 100644
index 0000000000..51c5e597cf
--- /dev/null
+++ b/src/quickdialogs2/quickdialogs2/qtquickdialogs2foreign.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 Dialogs 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 "qtquickdialogs2foreign_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QT_END_NAMESPACE
+
+#include "moc_qtquickdialogs2foreign_p.cpp"
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt b/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt
index a773510048..23c7728149 100644
--- a/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt
+++ b/src/quickdialogs2/quickdialogs2quickimpl/CMakeLists.txt
@@ -72,6 +72,7 @@ qt_internal_add_qml_module(QuickDialogs2QuickImpl
qquickplatformfontdialog_p.h
qquickplatformfontdialog.cpp
qtquickdialogs2quickimplforeign_p.h
+ qtquickdialogs2quickimplforeign.cpp
qtquickdialogs2quickimplglobal_p.h
qquickfontdialogimpl_p.h
qquickfontdialogimpl_p_p.h
diff --git a/src/quickdialogs2/quickdialogs2quickimpl/qtquickdialogs2quickimplforeign.cpp b/src/quickdialogs2/quickdialogs2quickimpl/qtquickdialogs2quickimplforeign.cpp
new file mode 100644
index 0000000000..78058cb133
--- /dev/null
+++ b/src/quickdialogs2/quickdialogs2quickimpl/qtquickdialogs2quickimplforeign.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 Dialogs 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 "qtquickdialogs2quickimplforeign_p.h"
+
+QT_BEGIN_NAMESPACE
+
+QT_END_NAMESPACE
+
+#include "moc_qtquickdialogs2quickimplforeign_p.cpp"