diff options
Diffstat (limited to 'src/core')
35 files changed, 68 insertions, 5 deletions
diff --git a/src/core/aspect/qcoreaspect.cpp b/src/core/aspect/qcoreaspect.cpp index b9aae3324..0a5999e51 100644 --- a/src/core/aspect/qcoreaspect.cpp +++ b/src/core/aspect/qcoreaspect.cpp @@ -153,3 +153,5 @@ void QCoreAspect::frameDone() QT_END_NAMESPACE QT3D_REGISTER_NAMESPACED_ASPECT("core", QT_PREPEND_NAMESPACE(Qt3DCore), QCoreAspect) + +#include "moc_qcoreaspect.cpp" diff --git a/src/core/aspect/qcoresettings.cpp b/src/core/aspect/qcoresettings.cpp index 81415de7e..39469e24b 100644 --- a/src/core/aspect/qcoresettings.cpp +++ b/src/core/aspect/qcoresettings.cpp @@ -135,3 +135,5 @@ void QCoreSettings::setBoundingVolumesEnabled(bool boundingVolumesEnabled) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qcoresettings.cpp" diff --git a/src/core/aspects/aspectcommanddebugger.cpp b/src/core/aspects/aspectcommanddebugger.cpp index 7635f44c0..1e4d7bd54 100644 --- a/src/core/aspects/aspectcommanddebugger.cpp +++ b/src/core/aspects/aspectcommanddebugger.cpp @@ -204,3 +204,5 @@ void AspectCommandDebugger::executeCommand(const QString &command, } // Qt3DCore QT_END_NAMESPACE + +#include "moc_aspectcommanddebugger_p.cpp" diff --git a/src/core/aspects/qabstractaspect.cpp b/src/core/aspects/qabstractaspect.cpp index 4c42b5093..f50c88df8 100644 --- a/src/core/aspects/qabstractaspect.cpp +++ b/src/core/aspects/qabstractaspect.cpp @@ -456,3 +456,7 @@ void AsynchronousCommandReply::setData(const QByteArray &data) } // of namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qabstractaspect_p.cpp" + +#include "moc_qabstractaspect.cpp" diff --git a/src/core/aspects/qabstractaspect_p.h b/src/core/aspects/qabstractaspect_p.h index f3878ed55..fea5dc311 100644 --- a/src/core/aspects/qabstractaspect_p.h +++ b/src/core/aspects/qabstractaspect_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtCore/QHash> #include <Qt3DCore/qabstractaspect.h> #include <Qt3DCore/private/qaspectjobproviderinterface_p.h> diff --git a/src/core/aspects/qaspectengine.cpp b/src/core/aspects/qaspectengine.cpp index c75bb150e..4a1ec0aeb 100644 --- a/src/core/aspects/qaspectengine.cpp +++ b/src/core/aspects/qaspectengine.cpp @@ -541,3 +541,5 @@ QAspectEngine::RunMode QAspectEngine::runMode() const } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qaspectengine.cpp" diff --git a/src/core/aspects/qaspectmanager.cpp b/src/core/aspects/qaspectmanager.cpp index 28f689c3c..72661aaa4 100644 --- a/src/core/aspects/qaspectmanager.cpp +++ b/src/core/aspects/qaspectmanager.cpp @@ -573,3 +573,5 @@ void QAspectManager::processFrame() } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qaspectmanager_p.cpp" diff --git a/src/core/doc/src/qmlextracontrollers.qdoc b/src/core/doc/src/qmlextracontrollers.qdoc index f02f4b29f..a1c3cb0a6 100644 --- a/src/core/doc/src/qmlextracontrollers.qdoc +++ b/src/core/doc/src/qmlextracontrollers.qdoc @@ -151,7 +151,7 @@ of the camera pan and tilt. */ /*! - \qmlproperty real OrbitCameraController::zoomLimit + \qmlproperty real OrbitCameraController::zoomInLimit Holds the current zoom-in limit. The zoom-in limit determines how close to the view center the camera can be zoomed. diff --git a/src/core/doc/src/qt3drender-porting-to-rhi.qdoc b/src/core/doc/src/qt3drender-porting-to-rhi.qdoc index 4f1709872..c0a23861b 100644 --- a/src/core/doc/src/qt3drender-porting-to-rhi.qdoc +++ b/src/core/doc/src/qt3drender-porting-to-rhi.qdoc @@ -69,7 +69,7 @@ \badcode Material { Effect { - technique: [ + techniques: [ Technique { id: gl3Technique graphicsApiFilter { diff --git a/src/core/geometry/qattribute.cpp b/src/core/geometry/qattribute.cpp index d3a564b66..7a5f529e5 100644 --- a/src/core/geometry/qattribute.cpp +++ b/src/core/geometry/qattribute.cpp @@ -503,3 +503,5 @@ The signal is emitted with \a vertexBaseType when the dataType changed. } // Qt3DCore QT_END_NAMESPACE + +#include "moc_qattribute.cpp" diff --git a/src/core/geometry/qboundingvolume.cpp b/src/core/geometry/qboundingvolume.cpp index 54bf9ffa8..8ecdbd3e9 100644 --- a/src/core/geometry/qboundingvolume.cpp +++ b/src/core/geometry/qboundingvolume.cpp @@ -390,3 +390,5 @@ bool QBoundingVolume::updateImplicitBounds() } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qboundingvolume.cpp" diff --git a/src/core/geometry/qbuffer.cpp b/src/core/geometry/qbuffer.cpp index 9169442f1..ad4eca85b 100644 --- a/src/core/geometry/qbuffer.cpp +++ b/src/core/geometry/qbuffer.cpp @@ -266,3 +266,5 @@ QBuffer::AccessType QBuffer::accessType() const } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qbuffer.cpp" diff --git a/src/core/geometry/qgeometryview.cpp b/src/core/geometry/qgeometryview.cpp index 6effa1d28..72c2f3c06 100644 --- a/src/core/geometry/qgeometryview.cpp +++ b/src/core/geometry/qgeometryview.cpp @@ -615,3 +615,5 @@ void QGeometryView::setPrimitiveType(QGeometryView::PrimitiveType primitiveType) } QT_END_NAMESPACE + +#include "moc_qgeometryview.cpp" diff --git a/src/core/jobs/qabstractaspectjobmanager.cpp b/src/core/jobs/qabstractaspectjobmanager.cpp index 5d921c778..c790cf47b 100644 --- a/src/core/jobs/qabstractaspectjobmanager.cpp +++ b/src/core/jobs/qabstractaspectjobmanager.cpp @@ -57,3 +57,5 @@ QAbstractAspectJobManager::QAbstractAspectJobManager(QObject *parent) } QT_END_NAMESPACE + +#include "moc_qabstractaspectjobmanager_p.cpp" diff --git a/src/core/jobs/qaspectjobmanager.cpp b/src/core/jobs/qaspectjobmanager.cpp index e352536cd..2d1106260 100644 --- a/src/core/jobs/qaspectjobmanager.cpp +++ b/src/core/jobs/qaspectjobmanager.cpp @@ -152,3 +152,5 @@ int QAspectJobManager::idealThreadCount() } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qaspectjobmanager_p.cpp" diff --git a/src/core/jobs/qthreadpooler.cpp b/src/core/jobs/qthreadpooler.cpp index b2f53b7e7..6dfd9f320 100644 --- a/src/core/jobs/qthreadpooler.cpp +++ b/src/core/jobs/qthreadpooler.cpp @@ -50,7 +50,7 @@ QThreadPooler::QThreadPooler(QObject *parent) , m_futureInterface(nullptr) , m_mutex() , m_taskCount(0) - , m_threadPool(QThreadPool::globalInstance()) + , m_threadPool(new QThreadPool(this)) , m_totalRunJobs(0) { m_threadPool->setMaxThreadCount(QAspectJobManager::idealThreadCount()); @@ -203,3 +203,5 @@ int QThreadPooler::currentCount() const } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qthreadpooler_p.cpp" diff --git a/src/core/jobs/qthreadpooler_p.h b/src/core/jobs/qthreadpooler_p.h index 058da2fc9..8d8be8d23 100644 --- a/src/core/jobs/qthreadpooler_p.h +++ b/src/core/jobs/qthreadpooler_p.h @@ -77,8 +77,6 @@ public: void taskFinished(RunnableInterface *task); QFuture<void> future(); - static int maxThreadCount(); - private: void enqueueTasks(const QList<RunnableInterface *> &tasks); void skipTask(RunnableInterface *task); diff --git a/src/core/nodes/propertychangehandler.cpp b/src/core/nodes/propertychangehandler.cpp index 0a1d59932..3d58b5f0f 100644 --- a/src/core/nodes/propertychangehandler.cpp +++ b/src/core/nodes/propertychangehandler.cpp @@ -84,3 +84,5 @@ void PropertyChangeHandlerBase::disconnectFromPropertyChange(const QObject *obje } QT_END_NAMESPACE + +#include "moc_propertychangehandler_p.cpp" diff --git a/src/core/nodes/qcomponent.cpp b/src/core/nodes/qcomponent.cpp index 5e41e2f67..21fb20a50 100644 --- a/src/core/nodes/qcomponent.cpp +++ b/src/core/nodes/qcomponent.cpp @@ -190,3 +190,5 @@ QComponent::QComponent(QComponentPrivate &dd, QNode *parent) */ QT_END_NAMESPACE + +#include "moc_qcomponent.cpp" diff --git a/src/core/nodes/qentity.cpp b/src/core/nodes/qentity.cpp index 25ec4434c..7685f0984 100644 --- a/src/core/nodes/qentity.cpp +++ b/src/core/nodes/qentity.cpp @@ -329,3 +329,5 @@ void QEntity::onParentChanged(QObject *) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qentity.cpp" diff --git a/src/core/nodes/qnode.cpp b/src/core/nodes/qnode.cpp index d9ab8f0dc..dd623995a 100644 --- a/src/core/nodes/qnode.cpp +++ b/src/core/nodes/qnode.cpp @@ -924,4 +924,6 @@ void NodePostConstructorInit::processNodes() QT_END_NAMESPACE +#include "moc_qnode_p.cpp" + #include "moc_qnode.cpp" diff --git a/src/core/qchangearbiter.cpp b/src/core/qchangearbiter.cpp index add672d1f..78b22eebc 100644 --- a/src/core/qchangearbiter.cpp +++ b/src/core/qchangearbiter.cpp @@ -113,3 +113,5 @@ QList<ComponentRelationshipChange> QChangeArbiter::takeDirtyEntityComponentNodes } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qchangearbiter_p.cpp" diff --git a/src/core/qscheduler.cpp b/src/core/qscheduler.cpp index c982e39ca..c72a3c48e 100644 --- a/src/core/qscheduler.cpp +++ b/src/core/qscheduler.cpp @@ -157,3 +157,5 @@ int QScheduler::scheduleAndWaitForFrameAspectJobs(qint64 time, bool dumpJobs) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qscheduler_p.cpp" diff --git a/src/core/services/qabstractframeadvanceservice.cpp b/src/core/services/qabstractframeadvanceservice.cpp index 15bf46afa..fc4752c62 100644 --- a/src/core/services/qabstractframeadvanceservice.cpp +++ b/src/core/services/qabstractframeadvanceservice.cpp @@ -91,3 +91,5 @@ QAbstractFrameAdvanceService::QAbstractFrameAdvanceService(QAbstractFrameAdvance } // Qt3D QT_END_NAMESPACE + +#include "moc_qabstractframeadvanceservice_p.cpp" diff --git a/src/core/services/qdownloadnetworkworker.cpp b/src/core/services/qdownloadnetworkworker.cpp index e1f806e92..ffc44b2a6 100644 --- a/src/core/services/qdownloadnetworkworker.cpp +++ b/src/core/services/qdownloadnetworkworker.cpp @@ -146,3 +146,5 @@ void QDownloadNetworkWorker::onDownloadProgressed(qint64 bytesReceived, qint64 b QT_END_NAMESPACE +#include "moc_qdownloadnetworkworker_p.cpp" + diff --git a/src/core/services/qeventfilterservice.cpp b/src/core/services/qeventfilterservice.cpp index 59b4eedb3..254a2d31e 100644 --- a/src/core/services/qeventfilterservice.cpp +++ b/src/core/services/qeventfilterservice.cpp @@ -189,4 +189,6 @@ bool InternalEventListener::eventFilter(QObject *obj, QEvent *e) QT_END_NAMESPACE +#include "moc_qeventfilterservice_p.cpp" + #include "qeventfilterservice.moc" diff --git a/src/core/services/qopenglinformationservice.cpp b/src/core/services/qopenglinformationservice.cpp index c1c05018e..76b4fa690 100644 --- a/src/core/services/qopenglinformationservice.cpp +++ b/src/core/services/qopenglinformationservice.cpp @@ -84,3 +84,5 @@ QOpenGLInformationService::QOpenGLInformationService(QOpenGLInformationServicePr } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qopenglinformationservice_p.cpp" diff --git a/src/core/services/qservicelocator.cpp b/src/core/services/qservicelocator.cpp index 73a40c2e4..2f8117bb4 100644 --- a/src/core/services/qservicelocator.cpp +++ b/src/core/services/qservicelocator.cpp @@ -267,3 +267,5 @@ QAbstractServiceProvider *QServiceLocator::_q_getServiceHelper(int type) } QT_END_NAMESPACE + +#include "moc_qservicelocator_p.cpp" diff --git a/src/core/services/qsysteminformationservice.cpp b/src/core/services/qsysteminformationservice.cpp index 02571482f..882aef15d 100644 --- a/src/core/services/qsysteminformationservice.cpp +++ b/src/core/services/qsysteminformationservice.cpp @@ -436,3 +436,5 @@ void QSystemInformationService::dumpCommand(const QString &command) } QT_END_NAMESPACE + +#include "moc_qsysteminformationservice_p.cpp" diff --git a/src/core/services/qtickclockservice.cpp b/src/core/services/qtickclockservice.cpp index 225e70ec2..f3f67ab4c 100644 --- a/src/core/services/qtickclockservice.cpp +++ b/src/core/services/qtickclockservice.cpp @@ -98,3 +98,5 @@ void QTickClockService::stop() } // Qt3D QT_END_NAMESPACE + +#include "moc_qtickclockservice_p.cpp" diff --git a/src/core/transforms/qabstractskeleton.cpp b/src/core/transforms/qabstractskeleton.cpp index cdda89418..8d30b27da 100644 --- a/src/core/transforms/qabstractskeleton.cpp +++ b/src/core/transforms/qabstractskeleton.cpp @@ -130,3 +130,5 @@ void QAbstractSkeletonPrivate::setJointCount(int jointCount) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qabstractskeleton.cpp" diff --git a/src/core/transforms/qarmature.cpp b/src/core/transforms/qarmature.cpp index 56d310152..528827e7f 100644 --- a/src/core/transforms/qarmature.cpp +++ b/src/core/transforms/qarmature.cpp @@ -160,3 +160,5 @@ void QArmature::setSkeleton(Qt3DCore::QAbstractSkeleton *skeleton) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qarmature.cpp" diff --git a/src/core/transforms/qjoint.cpp b/src/core/transforms/qjoint.cpp index 1c0233f49..2df5b9b96 100644 --- a/src/core/transforms/qjoint.cpp +++ b/src/core/transforms/qjoint.cpp @@ -391,3 +391,5 @@ QString QJoint::name() const } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qjoint.cpp" diff --git a/src/core/transforms/qskeleton.cpp b/src/core/transforms/qskeleton.cpp index 751daaabe..a268378a8 100644 --- a/src/core/transforms/qskeleton.cpp +++ b/src/core/transforms/qskeleton.cpp @@ -139,3 +139,5 @@ void QSkeleton::setRootJoint(Qt3DCore::QJoint *rootJoint) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qskeleton.cpp" diff --git a/src/core/transforms/qskeletonloader.cpp b/src/core/transforms/qskeletonloader.cpp index e86c72fbf..6197f1ad1 100644 --- a/src/core/transforms/qskeletonloader.cpp +++ b/src/core/transforms/qskeletonloader.cpp @@ -242,3 +242,5 @@ void QSkeletonLoader::setRootJoint(QJoint *rootJoint) } // namespace Qt3DCore QT_END_NAMESPACE + +#include "moc_qskeletonloader.cpp" |