summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Krus <mike.krus@kdab.com>2022-06-21 16:00:46 +0100
committerMike Krus <mike.krus@kdab.com>2022-06-23 10:52:33 +0100
commitfeed7cf15a3fe7c2a68525d214d2f00d9d4017a9 (patch)
treeec51770dc5cbd44cc8a8546ab1a438e2254a0b0f
parent2624bc4e7ade11cdb210b2bb27fb0ffd971036a7 (diff)
Qt3D Tests: includemocs
Task-number: QTBUG-103286 Pick-to: 6.3 6.2 5.15 Change-Id: I8e97b8d7f997fa42a791d0daebe5987e99c97b30 Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
-rw-r--r--tests/auto/core/common/qbackendnodetester.cpp2
-rw-r--r--tests/auto/input/abstractaxisinput/CMakeLists.txt3
-rw-r--r--tests/auto/input/actioninput/CMakeLists.txt1
-rw-r--r--tests/auto/input/analogaxisinput/CMakeLists.txt1
-rw-r--r--tests/auto/input/buttonaxisinput/CMakeLists.txt1
-rw-r--r--tests/auto/input/commons/testdevice.cpp30
-rw-r--r--tests/auto/input/inputchord/CMakeLists.txt1
-rw-r--r--tests/auto/input/inputsequence/CMakeLists.txt1
-rw-r--r--tests/auto/input/keyboardhandler/CMakeLists.txt1
-rw-r--r--tests/auto/input/loadproxydevicejob/CMakeLists.txt1
-rw-r--r--tests/auto/input/physicaldeviceproxy/CMakeLists.txt1
-rw-r--r--tests/auto/input/qabstractaxisinput/CMakeLists.txt1
-rw-r--r--tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt1
-rw-r--r--tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt1
-rw-r--r--tests/auto/input/qaction/CMakeLists.txt1
-rw-r--r--tests/auto/input/qactioninput/CMakeLists.txt1
-rw-r--r--tests/auto/input/qanalogaxisinput/CMakeLists.txt1
-rw-r--r--tests/auto/input/qaxisaccumulator/CMakeLists.txt1
-rw-r--r--tests/auto/input/qbuttonaxisinput/CMakeLists.txt1
-rw-r--r--tests/auto/input/qkeyboardhandler/CMakeLists.txt1
-rw-r--r--tests/auto/input/qmousedevice/CMakeLists.txt1
-rw-r--r--tests/auto/input/qmouseevent/CMakeLists.txt1
-rw-r--r--tests/auto/input/utils/CMakeLists.txt1
-rw-r--r--tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp1
-rw-r--r--tests/auto/render/qmlscenereader/qmlscenereader.cpp2
-rw-r--r--tests/auto/render/qmlscenereader/qmlscenereader.h5
-rw-r--r--tests/auto/shared/util.cpp2
27 files changed, 64 insertions, 1 deletions
diff --git a/tests/auto/core/common/qbackendnodetester.cpp b/tests/auto/core/common/qbackendnodetester.cpp
index f183667da..5ed2ecc6d 100644
--- a/tests/auto/core/common/qbackendnodetester.cpp
+++ b/tests/auto/core/common/qbackendnodetester.cpp
@@ -22,3 +22,5 @@ void QBackendNodeTester::setPeerId(QBackendNode *backend, QNodeId id)
} // namespace Qt3DCore
QT_END_NAMESPACE
+
+#include "moc_qbackendnodetester.cpp"
diff --git a/tests/auto/input/abstractaxisinput/CMakeLists.txt b/tests/auto/input/abstractaxisinput/CMakeLists.txt
index 10dc60834..7d8bf5518 100644
--- a/tests/auto/input/abstractaxisinput/CMakeLists.txt
+++ b/tests/auto/input/abstractaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_abstractaxisinput
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_abstractaxisinput.cpp
INCLUDE_DIRECTORIES
@@ -30,5 +31,5 @@ qt_internal_add_test(tst_abstractaxisinput
qt_internal_extend_target(tst_abstractaxisinput CONDITION QT_FEATURE_private_tests
SOURCES
../../core/common/qbackendnodetester.cpp ../../core/common/qbackendnodetester.h
- ../../core/common/testarbiter.h
+ ../../core/common/testarbiter.h ../commons/testdevice.cpp
)
diff --git a/tests/auto/input/actioninput/CMakeLists.txt b/tests/auto/input/actioninput/CMakeLists.txt
index f9564e2ac..aef9c7df4 100644
--- a/tests/auto/input/actioninput/CMakeLists.txt
+++ b/tests/auto/input/actioninput/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_actioninput
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_actioninput.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/analogaxisinput/CMakeLists.txt b/tests/auto/input/analogaxisinput/CMakeLists.txt
index 72cbbf68c..70645da56 100644
--- a/tests/auto/input/analogaxisinput/CMakeLists.txt
+++ b/tests/auto/input/analogaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_analogaxisinput
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_analogaxisinput.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/buttonaxisinput/CMakeLists.txt b/tests/auto/input/buttonaxisinput/CMakeLists.txt
index 3329ff12c..6529b75b6 100644
--- a/tests/auto/input/buttonaxisinput/CMakeLists.txt
+++ b/tests/auto/input/buttonaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_buttonaxisinput
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_buttonaxisinput.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/commons/testdevice.cpp b/tests/auto/input/commons/testdevice.cpp
new file mode 100644
index 000000000..898766fe7
--- /dev/null
+++ b/tests/auto/input/commons/testdevice.cpp
@@ -0,0 +1,30 @@
+/****************************************************************************
+**
+** Copyright (C) 2022 Klaralvdalens Datakonsult AB (KDAB).
+** Contact: https://www.qt.io/licensing/
+**
+** This file is part of the Qt3D module of the Qt Toolkit.
+**
+** $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 "moc_testdevice.cpp"
+#include "moc_testdeviceproxy.cpp"
diff --git a/tests/auto/input/inputchord/CMakeLists.txt b/tests/auto/input/inputchord/CMakeLists.txt
index 49257f421..aeca88132 100644
--- a/tests/auto/input/inputchord/CMakeLists.txt
+++ b/tests/auto/input/inputchord/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_inputchord
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_inputchord.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/inputsequence/CMakeLists.txt b/tests/auto/input/inputsequence/CMakeLists.txt
index b0faec313..6e58f758b 100644
--- a/tests/auto/input/inputsequence/CMakeLists.txt
+++ b/tests/auto/input/inputsequence/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_inputsequence
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_inputsequence.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/keyboardhandler/CMakeLists.txt b/tests/auto/input/keyboardhandler/CMakeLists.txt
index 8726bd533..146177c86 100644
--- a/tests/auto/input/keyboardhandler/CMakeLists.txt
+++ b/tests/auto/input/keyboardhandler/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_keyboardhandler
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_keyboardhandler.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/loadproxydevicejob/CMakeLists.txt b/tests/auto/input/loadproxydevicejob/CMakeLists.txt
index edb18d443..54c71fa26 100644
--- a/tests/auto/input/loadproxydevicejob/CMakeLists.txt
+++ b/tests/auto/input/loadproxydevicejob/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_loadproxydevicejob
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_loadproxydevicejob.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/physicaldeviceproxy/CMakeLists.txt b/tests/auto/input/physicaldeviceproxy/CMakeLists.txt
index 263e6ef4b..0598f3045 100644
--- a/tests/auto/input/physicaldeviceproxy/CMakeLists.txt
+++ b/tests/auto/input/physicaldeviceproxy/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_physicaldeviceproxy
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_physicaldeviceproxy.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qabstractaxisinput/CMakeLists.txt b/tests/auto/input/qabstractaxisinput/CMakeLists.txt
index 28d7f53b2..30e354690 100644
--- a/tests/auto/input/qabstractaxisinput/CMakeLists.txt
+++ b/tests/auto/input/qabstractaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_qabstractaxisinput
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qabstractaxisinput.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt b/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt
index 2d42dd1f7..205c9c415 100644
--- a/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt
+++ b/tests/auto/input/qabstractphysicaldevicebackendnode/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_qabstractphysicaldevicebackendnode
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qabstractphysicaldevicebackendnode.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt b/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt
index e1d6aac23..33ebd9fb8 100644
--- a/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt
+++ b/tests/auto/input/qabstractphysicaldeviceproxy/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_qabstractphysicaldeviceproxy
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qabstractphysicaldeviceproxy.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qaction/CMakeLists.txt b/tests/auto/input/qaction/CMakeLists.txt
index 724ef0b7a..1a16130c8 100644
--- a/tests/auto/input/qaction/CMakeLists.txt
+++ b/tests/auto/input/qaction/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_internal_add_test(tst_qt3d_qaction
# special case end
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qaction.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qactioninput/CMakeLists.txt b/tests/auto/input/qactioninput/CMakeLists.txt
index 186b30b49..8fb91057d 100644
--- a/tests/auto/input/qactioninput/CMakeLists.txt
+++ b/tests/auto/input/qactioninput/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_qactioninput
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qactioninput.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qanalogaxisinput/CMakeLists.txt b/tests/auto/input/qanalogaxisinput/CMakeLists.txt
index 147ff97c3..a4c66c558 100644
--- a/tests/auto/input/qanalogaxisinput/CMakeLists.txt
+++ b/tests/auto/input/qanalogaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_qanalogaxisinput
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qanalogaxisinput.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qaxisaccumulator/CMakeLists.txt b/tests/auto/input/qaxisaccumulator/CMakeLists.txt
index 86337c38e..a26215f93 100644
--- a/tests/auto/input/qaxisaccumulator/CMakeLists.txt
+++ b/tests/auto/input/qaxisaccumulator/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_qaxisaccumulator
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qaxisaccumulator.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qbuttonaxisinput/CMakeLists.txt b/tests/auto/input/qbuttonaxisinput/CMakeLists.txt
index 36698b66a..0a0b1729a 100644
--- a/tests/auto/input/qbuttonaxisinput/CMakeLists.txt
+++ b/tests/auto/input/qbuttonaxisinput/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_qbuttonaxisinput
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qbuttonaxisinput.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qkeyboardhandler/CMakeLists.txt b/tests/auto/input/qkeyboardhandler/CMakeLists.txt
index 452292249..6285d9af0 100644
--- a/tests/auto/input/qkeyboardhandler/CMakeLists.txt
+++ b/tests/auto/input/qkeyboardhandler/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_qkeyboardhandler
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qkeyboardhandler.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qmousedevice/CMakeLists.txt b/tests/auto/input/qmousedevice/CMakeLists.txt
index 62e3247ec..a8f4ed6b6 100644
--- a/tests/auto/input/qmousedevice/CMakeLists.txt
+++ b/tests/auto/input/qmousedevice/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_qmousedevice
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qmousedevice.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/qmouseevent/CMakeLists.txt b/tests/auto/input/qmouseevent/CMakeLists.txt
index 8a2e0bb8b..39698ade4 100644
--- a/tests/auto/input/qmouseevent/CMakeLists.txt
+++ b/tests/auto/input/qmouseevent/CMakeLists.txt
@@ -9,6 +9,7 @@ qt_internal_add_test(tst_qt3d_qmouseevent
#special case end
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_qmouseevent.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/input/utils/CMakeLists.txt b/tests/auto/input/utils/CMakeLists.txt
index 0ff18ec4d..2576b2b88 100644
--- a/tests/auto/input/utils/CMakeLists.txt
+++ b/tests/auto/input/utils/CMakeLists.txt
@@ -7,6 +7,7 @@
qt_internal_add_test(tst_utils
SOURCES
../commons/testdevice.h
+ ../commons/testdevice.cpp
../commons/testdeviceproxy.h
tst_utils.cpp
INCLUDE_DIRECTORIES
diff --git a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
index d44b36baa..1291720bd 100644
--- a/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
+++ b/tests/auto/quick3d/quick3dnodeinstantiator/tst_quick3dnodeinstantiator.cpp
@@ -228,3 +228,4 @@ void tst_quick3dnodeinstantiator::createAndRemove()
QTEST_MAIN(tst_quick3dnodeinstantiator)
#include "tst_quick3dnodeinstantiator.moc"
+#include "moc_stringmodel.cpp"
diff --git a/tests/auto/render/qmlscenereader/qmlscenereader.cpp b/tests/auto/render/qmlscenereader/qmlscenereader.cpp
index c34377193..8855ae146 100644
--- a/tests/auto/render/qmlscenereader/qmlscenereader.cpp
+++ b/tests/auto/render/qmlscenereader/qmlscenereader.cpp
@@ -46,3 +46,5 @@ void QmlSceneReader::loadComplete()
}
QT_END_NAMESPACE
+
+#include "moc_qmlscenereader.cpp"
diff --git a/tests/auto/render/qmlscenereader/qmlscenereader.h b/tests/auto/render/qmlscenereader/qmlscenereader.h
index 8c51c6323..e53ce0e97 100644
--- a/tests/auto/render/qmlscenereader/qmlscenereader.h
+++ b/tests/auto/render/qmlscenereader/qmlscenereader.h
@@ -1,6 +1,9 @@
// Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
+#ifndef QMLSCENEREADER_H
+#define QMLSCENEREADER_H
+
#include <QObject>
QT_BEGIN_NAMESPACE
@@ -25,3 +28,5 @@ private:
};
QT_END_NAMESPACE
+
+#endif
diff --git a/tests/auto/shared/util.cpp b/tests/auto/shared/util.cpp
index 4ef841a55..b91acfe9e 100644
--- a/tests/auto/shared/util.cpp
+++ b/tests/auto/shared/util.cpp
@@ -98,3 +98,5 @@ QQmlTestMessageHandler::~QQmlTestMessageHandler()
qInstallMessageHandler(m_oldHandler);
QQmlTestMessageHandler::m_instance = 0;
}
+
+#include "moc_util.cpp"