From 8b3b868f4c06376bfd455c9de44a449ba6d4e740 Mon Sep 17 00:00:00 2001 From: Ulf Hermann Date: Fri, 15 Aug 2014 12:48:47 +0200 Subject: [PATCH] QmlProfiler: Rename JavaScript view to "V8" The fact that the separate JavaScript view only works with versions of Qt that use the V8 JavaScript engine is frequently confusing users. JavaScript events for newer versions of Qt are integrated into the Events and Timeline views, making the separate JavaScript view obsolete. For those users who already know it and who are still using Qt 5.0 and 5.1 "V8" will be recognizable. For others "V8" won't mean anything and they'll ignore it. Change-Id: Iac0d89db24a3677e47b978a152cfc25c01f9c2b6 Task-number: QTCREATORBUG-12766 Reviewed-by: Leena Miettinen Reviewed-by: Robert Loehning --- doc/src/analyze/qtquick-profiler.qdoc | 2 +- src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp | 2 +- tests/system/objects.map | 2 +- tests/system/suite_debugger/tst_simple_analyze/test.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/src/analyze/qtquick-profiler.qdoc b/doc/src/analyze/qtquick-profiler.qdoc index d9ccd2023e1..accb949c41c 100644 --- a/doc/src/analyze/qtquick-profiler.qdoc +++ b/doc/src/analyze/qtquick-profiler.qdoc @@ -299,7 +299,7 @@ JavaScript events are shown in the \gui Events view only for applications that use Qt Quick 2 and are compiled with Qt 5.3 or later. For applications that use Qt Quick 2 and are built with Qt 5.0 or 5.1, you can view - information about JavaScript events in the separate \gui JavaScript view. + information about JavaScript events in the separate \gui V8 view. \section2 Viewing More Data diff --git a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp index ec2a9819d5d..a0bcebc5f8b 100644 --- a/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp +++ b/src/plugins/qmlprofiler/qmlprofilerviewmanager.cpp @@ -114,7 +114,7 @@ void QmlProfilerViewManager::createViews() d->v8profilerView = new QV8ProfilerEventsWidget(mw, d->profilerTool, this, d->profilerModelManager); - d->v8profilerView->setWindowTitle(tr("JavaScript")); + d->v8profilerView->setWindowTitle(tr("V8")); connect(d->v8profilerView, SIGNAL(gotoSourceLocation(QString,int,int)), this, SIGNAL(gotoSourceLocation(QString,int,int))); connect(d->traceView, SIGNAL(gotoSourceLocation(QString,int,int)), diff --git a/tests/system/objects.map b/tests/system/objects.map index 8637b38df7d..5f5153a28bf 100644 --- a/tests/system/objects.map +++ b/tests/system/objects.map @@ -9,7 +9,7 @@ :*Qt Creator.Find_Find::Internal::FindToolBar {name='Core__Internal__FindWidget' type='Core::Internal::FindToolBar' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='Find'} :*Qt Creator.FormEditorStack_Designer::Internal::FormEditorStack {name='FormEditorStack' type='Designer::Internal::FormEditorStack' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :*Qt Creator.Interrupt_Core::Internal::FancyToolButton {text='Interrupt' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} -:*Qt Creator.JavaScript_QDockWidget {name='QmlProfilerV8ProfileViewDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='JavaScript'} +:*Qt Creator.JavaScript_QDockWidget {name='QmlProfilerV8ProfileViewDockWidget' type='QDockWidget' visible='1' window=':Qt Creator_Core::Internal::MainWindow' windowTitle='V8'} :*Qt Creator.JavaScript_QTabBar {aboveWidget=':*Qt Creator.JavaScript_QDockWidget' type='QTabBar' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :*Qt Creator.Run_Core::Internal::FancyToolButton {text='Run' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} :*Qt Creator.Start Debugging_Core::Internal::FancyToolButton {text='Start Debugging' type='Core::Internal::FancyToolButton' unnamed='1' visible='1' window=':Qt Creator_Core::Internal::MainWindow'} diff --git a/tests/system/suite_debugger/tst_simple_analyze/test.py b/tests/system/suite_debugger/tst_simple_analyze/test.py index da890c743e6..62d053abc6f 100644 --- a/tests/system/suite_debugger/tst_simple_analyze/test.py +++ b/tests/system/suite_debugger/tst_simple_analyze/test.py @@ -106,7 +106,7 @@ def performTest(workingDir, projectName, targetCount, availableConfigs, disableO "Elapsed time should be positive in string '%s'" % str(elapsedLabel.text)) except: test.fatal("Could not read elapsed time from '%s'" % str(elapsedLabel.text)) - if safeClickTab("JavaScript"): + if safeClickTab("V8"): model = findObject(":JavaScript.QmlProfilerEventsTable_QmlProfiler::" "Internal::QV8ProfilerEventsMainView").model() test.compare(model.rowCount(), 0)