diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2015-10-16 11:27:04 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2015-10-18 16:48:39 +0000 |
commit | 6753c0238bd137f2d5f2528ada2d333e38ef2376 (patch) | |
tree | e5e55cebf0f4d43cc9add8b38957699b47b8d227 | |
parent | 5b8571b615fff165bbb878cc653681ff39543b35 (diff) |
Remove last vestiges of threadweaver
Who knows, maybe one day we'll find time to make the tasking subsystem
configurable. I'm still very interested to try Intel TBB with Qt3D.
Change-Id: I7a48a173e856df09ed442975603bee0fbda67654
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
-rw-r--r-- | src/core/jobs/jobs.pri | 9 | ||||
-rw-r--r-- | src/core/jobs/qaspectjobmanager.cpp | 8 | ||||
-rw-r--r-- | src/core/jobs/weaverjob.cpp | 57 | ||||
-rw-r--r-- | src/core/jobs/weaverjob_p.h | 72 |
4 files changed, 0 insertions, 146 deletions
diff --git a/src/core/jobs/jobs.pri b/src/core/jobs/jobs.pri index 35de78e50..bdd4670ce 100644 --- a/src/core/jobs/jobs.pri +++ b/src/core/jobs/jobs.pri @@ -7,15 +7,6 @@ SOURCES += \ $$PWD/task.cpp \ $$PWD/dependencyhandler.cpp -# TODO: Make tasking API configurable -#use_thread_weaver { -#SOURCES += \ -# $$PWD/weaverjob.cpp -# -#HEADERS += \ -# $$PWD/weaverjob_p.h \ -#} - HEADERS += \ $$PWD/qaspectjob.h \ $$PWD/qaspectjob_p.h \ diff --git a/src/core/jobs/qaspectjobmanager.cpp b/src/core/jobs/qaspectjobmanager.cpp index 47793e740..cbe4e60ad 100644 --- a/src/core/jobs/qaspectjobmanager.cpp +++ b/src/core/jobs/qaspectjobmanager.cpp @@ -34,14 +34,6 @@ ** ****************************************************************************/ -#ifdef THREAD_WEAVER -#include <threadweaver.h> -#include <dependencypolicy.h> -#include <thread.h> -#include "job.h" -#include "weaverjob_p.h" -#endif - #include "qaspectjobmanager_p.h" #include "task_p.h" #include "qthreadpooler_p.h" diff --git a/src/core/jobs/weaverjob.cpp b/src/core/jobs/weaverjob.cpp deleted file mode 100644 index f006bf438..000000000 --- a/src/core/jobs/weaverjob.cpp +++ /dev/null @@ -1,57 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include "weaverjob_p.h" - -QT_BEGIN_NAMESPACE - -namespace Qt3DCore { - -WeaverJob::WeaverJob() -{ -} - -void WeaverJob::run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) -{ - Q_UNUSED(self); - Q_UNUSED(thread); - if (m_job) - m_job->run(); -} - -} // namespace Qt3DCore - -QT_END_NAMESPACE diff --git a/src/core/jobs/weaverjob_p.h b/src/core/jobs/weaverjob_p.h deleted file mode 100644 index dff2a6331..000000000 --- a/src/core/jobs/weaverjob_p.h +++ /dev/null @@ -1,72 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2014 Klaralvdalens Datakonsult AB (KDAB). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt3D module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 http://www.qt.io/terms-conditions. For further -** information use the contact form at http://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.LGPLv3 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.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 later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QT3DCORE_WEAVERJOB_H -#define QT3DCORE_WEAVERJOB_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists purely as an -// implementation detail. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <job.h> -#include <Qt3DCore/qaspectjob.h> - -QT_BEGIN_NAMESPACE - -namespace Qt3DCore { - -class WeaverJob : public ThreadWeaver::Job -{ -public: - WeaverJob(); - - void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) Q_DECL_OVERRIDE; - - QAspectJobPtr m_job; -}; - -} // namespace Qt3DCore - -QT_END_NAMESPACE - -#endif // QT3DCORE_WEAVERJOB_H |