diff options
author | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-07-21 16:39:57 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@theqtcompany.com> | 2015-08-04 13:35:28 +0000 |
commit | 38fe08b8af9015264a1f8a5f4dcf1dd40f04f4ba (patch) | |
tree | 60b9d8c3902272f1653de43e21211ef5f5e14b7a /src/qml/debugger | |
parent | 5652c4163f94aaf4bd9cef994be2ae8e7f4096c5 (diff) |
Move QQmlConfigurableDebugService into qmltooling/shared
It's only used by plugins now.
Change-Id: Ia73a2a22ba6bccbd85bbca6eda2fb9f5a8d6dd3b
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/debugger')
-rw-r--r-- | src/qml/debugger/debugger.pri | 1 | ||||
-rw-r--r-- | src/qml/debugger/qqmlconfigurabledebugservice_p.h | 106 |
2 files changed, 0 insertions, 107 deletions
diff --git a/src/qml/debugger/debugger.pri b/src/qml/debugger/debugger.pri index 728394916c..30a44eedd1 100644 --- a/src/qml/debugger/debugger.pri +++ b/src/qml/debugger/debugger.pri @@ -16,7 +16,6 @@ HEADERS += \ $$PWD/qqmldebugserviceinterfaces_p.h \ $$PWD/qqmldebugstatesdelegate_p.h \ $$PWD/qqmldebug.h \ - $$PWD/qqmlconfigurabledebugservice_p.h \ $$PWD/qqmlprofilerdefinitions_p.h \ $$PWD/qqmlabstractprofileradapter_p.h \ $$PWD/qqmlprofiler_p.h diff --git a/src/qml/debugger/qqmlconfigurabledebugservice_p.h b/src/qml/debugger/qqmlconfigurabledebugservice_p.h deleted file mode 100644 index ce7609f830..0000000000 --- a/src/qml/debugger/qqmlconfigurabledebugservice_p.h +++ /dev/null @@ -1,106 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the QtQml module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL21$ -** 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 2.1 or version 3 as published by the Free -** Software Foundation and appearing in the file LICENSE.LGPLv21 and -** LICENSE.LGPLv3 included in the packaging of this file. Please review the -** following information to ensure the GNU Lesser General Public License -** requirements will be met: https://www.gnu.org/licenses/lgpl.html and -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** As a special exception, The Qt Company gives you certain additional -** rights. These rights are described in The Qt Company LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef QQMLCONFIGURABLEDEBUGSEVICE_H -#define QQMLCONFIGURABLEDEBUGSEVICE_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 "qqmldebugservice_p.h" -#include "qqmldebugconnector_p.h" -#include <QtCore/qmutex.h> - -QT_BEGIN_NAMESPACE - -template <class Base> -class QQmlConfigurableDebugService : public Base -{ -protected: - QQmlConfigurableDebugService(float version, QObject *parent = 0) : - Base(version, parent), m_configMutex(QMutex::Recursive) - { - init(); - } - - void stopWaiting() - { - QMutexLocker lock(&m_configMutex); - m_waitingForConfiguration = false; - foreach (QQmlEngine *engine, m_waitingEngines) - emit Base::attachedToEngine(engine); - m_waitingEngines.clear(); - } - - void init() - { - QMutexLocker lock(&m_configMutex); - // If we're not enabled or not blocking, don't wait for configuration - m_waitingForConfiguration = (Base::state() == QQmlDebugService::Enabled && - QQmlDebugConnector::instance()->blockingMode()); - } - - void stateChanged(QQmlDebugService::State newState) - { - if (newState != QQmlDebugService::Enabled) - stopWaiting(); - else - init(); - } - - void engineAboutToBeAdded(QQmlEngine *engine) - { - QMutexLocker lock(&m_configMutex); - if (m_waitingForConfiguration) - m_waitingEngines.append(engine); - else - emit Base::attachedToEngine(engine); - } - - QMutex m_configMutex; - QList<QQmlEngine *> m_waitingEngines; - bool m_waitingForConfiguration; -}; - -QT_END_NAMESPACE - -#endif // QQMLCONFIGURABLEDEBUGSEVICE_H |