diff options
author | Ulf Hermann <ulf.hermann@digia.com> | 2013-12-10 12:02:40 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-23 10:19:24 +0100 |
commit | ff379a67cb891bf2c06ae549bc6e6b0ddfaf54e0 (patch) | |
tree | 63d4c9892e61cf8f713ef1fcd8d3bd1b1b539935 /src/qml/qml/v8 | |
parent | e2ea0a83cc876fb54a2a8bf6f1350dbfa52f596b (diff) |
Rename V8 profiler classes to V4
Change-Id: I54a71b83bdcaa4198b63a08572bc3d9d1bf8deea
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/qml/v8')
-rw-r--r-- | src/qml/qml/v8/qqmlbuiltinfunctions.cpp | 6 | ||||
-rw-r--r-- | src/qml/qml/v8/qv8profiler_p.h | 42 | ||||
-rw-r--r-- | src/qml/qml/v8/v8.pri | 1 |
3 files changed, 3 insertions, 46 deletions
diff --git a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp index 972e8cf2e3..26ef86836c 100644 --- a/src/qml/qml/v8/qqmlbuiltinfunctions.cpp +++ b/src/qml/qml/v8/qqmlbuiltinfunctions.cpp @@ -48,7 +48,7 @@ #include <private/qqmllocale_p.h> #include <private/qv8engine_p.h> -#include <private/qv8profilerservice_p.h> +#include <private/qv4profilerservice_p.h> #include <private/qqmlprofilerservice_p.h> #include <private/qqmlglobal_p.h> @@ -1435,7 +1435,7 @@ QV4::ReturnedValue ConsoleObject::method_profile(CallContext *ctx) if (!QQmlDebugService::isDebuggingEnabled()) { logger.warning("Cannot start profiling because debug service is disabled. Start with -qmljsdebugger=port:XXXXX."); } else if (QQmlProfilerService::startProfiling()) { - QV8ProfilerService::instance()->startProfiling(title); + QV4ProfilerService::instance()->startProfiling(title); logger.debug("Profiling started."); } else { @@ -1460,7 +1460,7 @@ QV4::ReturnedValue ConsoleObject::method_profileEnd(CallContext *ctx) QMessageLogger logger(baSource.constData(), frame.line, baFunction.constData()); if (QQmlProfilerService::stopProfiling()) { - QV8ProfilerService *profiler = QV8ProfilerService::instance(); + QV4ProfilerService *profiler = QV4ProfilerService::instance(); profiler->stopProfiling(title); QQmlProfilerService::sendProfilingData(); profiler->sendProfilingData(); diff --git a/src/qml/qml/v8/qv8profiler_p.h b/src/qml/qml/v8/qv8profiler_p.h deleted file mode 100644 index 39a87f2156..0000000000 --- a/src/qml/qml/v8/qv8profiler_p.h +++ /dev/null @@ -1,42 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the QtQml 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$ -** -****************************************************************************/ - -//#include <private/v8-profiler.h> diff --git a/src/qml/qml/v8/v8.pri b/src/qml/qml/v8/v8.pri index 2480848514..b4eb706574 100644 --- a/src/qml/qml/v8/v8.pri +++ b/src/qml/qml/v8/v8.pri @@ -1,6 +1,5 @@ HEADERS += \ $$PWD/qv8debug_p.h \ - $$PWD/qv8profiler_p.h \ $$PWD/qv8engine_p.h \ $$PWD/qv4domerrors_p.h \ $$PWD/qv4sqlerrors_p.h \ |