summaryrefslogtreecommitdiffstats
path: root/src/core/jobs/qabstractaspectjobmanager_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2014-11-02 20:39:03 +0000
committerSean Harmer <sean.harmer@kdab.com>2014-11-03 17:42:51 +0100
commitea3f99ebe1c846f46fa73d86aa65c4d660a848c4 (patch)
tree4d97dd34a99cec4e7ed56a872fb9d64dbb19d68a /src/core/jobs/qabstractaspectjobmanager_p.h
parent46c7d625c0ffe6ec609efdb28a0ea5e065e48bb3 (diff)
More work towards a clean shutdown
The QAspectJobManager doesn't really need to be public now I think but as it still is let's make the base class have it's own private class that inherits from QObjectPrivate. The ThreadWeaver threads all get cleaned up cleanly upon shutdown. When trying with cylinder-cpp with all the rendering stuff in main() commented out, we consistently get the crash in QFontCache. With the rendering stuff enabled there is also an assert inside the swapbuffers() call. This is because the render thread is not cleanly shutdown yet. The QFontCache crash is something to do with freeing thread-local storage. I will continue to investigate. Change-Id: Ib3ad3ea04ae4859d27f0dd4604b00bc5a38859a1 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/core/jobs/qabstractaspectjobmanager_p.h')
-rw-r--r--src/core/jobs/qabstractaspectjobmanager_p.h65
1 files changed, 65 insertions, 0 deletions
diff --git a/src/core/jobs/qabstractaspectjobmanager_p.h b/src/core/jobs/qabstractaspectjobmanager_p.h
new file mode 100644
index 000000000..f5ac5d0c3
--- /dev/null
+++ b/src/core/jobs/qabstractaspectjobmanager_p.h
@@ -0,0 +1,65 @@
+/****************************************************************************
+**
+** 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: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 Digia. For licensing terms and
+** conditions see http://qt.digia.com/licensing. For further information
+** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights. These rights are described in the Digia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 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 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QABSTRACTASPECTJOBMANAGER_P_H
+#define QABSTRACTASPECTJOBMANAGER_P_H
+
+#include <private/qobject_p.h>
+
+QT_BEGIN_NAMESPACE
+
+namespace Qt3D {
+
+class QAbstractAspectJobManager;
+
+class QAbstractAspectJobManagerPrivate : public QObjectPrivate
+{
+public:
+ QAbstractAspectJobManagerPrivate()
+ : QObjectPrivate()
+ {}
+};
+
+} // Qt3D
+
+QT_END_NAMESPACE
+
+#endif // QABSTRACTASPECTJOBMANAGER_P_H