aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/qmlprofiler/qml
diff options
context:
space:
mode:
authorUlf Hermann <ulf.hermann@theqtcompany.com>2014-12-09 10:35:01 +0100
committerUlf Hermann <ulf.hermann@theqtcompany.com>2014-12-15 14:51:23 +0100
commitc86efd21792dc9b1039fbe4d60ce901dec9723b2 (patch)
tree54f3568b3b0cd7577bd85feb2586c70b9ab27477 /src/plugins/qmlprofiler/qml
parentd7206ee3c30e198bf08e2940ea67ba63f138801f (diff)
QmlProfiler: cleanup QmlProfilerTraceView
Remove some unnecessary code and consolidate things. Change-Id: I3f6c971b84368013a60a7a7fa9545480b0cd551b Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
Diffstat (limited to 'src/plugins/qmlprofiler/qml')
-rw-r--r--src/plugins/qmlprofiler/qml/MainView.qml2
-rw-r--r--src/plugins/qmlprofiler/qml/Overview.qml1
-rw-r--r--src/plugins/qmlprofiler/qml/RangeDetails.qml1
-rw-r--r--src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml1
-rw-r--r--src/plugins/qmlprofiler/qml/TimelineContent.qml2
5 files changed, 2 insertions, 5 deletions
diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml
index 4f2a71eca19..609ceffb3cc 100644
--- a/src/plugins/qmlprofiler/qml/MainView.qml
+++ b/src/plugins/qmlprofiler/qml/MainView.qml
@@ -179,7 +179,7 @@ Rectangle {
ButtonsBar {
id: buttonsBar
- enabled: false
+ enabled: timelineModelAggregator.height > 0
anchors.top: parent.top
anchors.left: parent.left
width: 150
diff --git a/src/plugins/qmlprofiler/qml/Overview.qml b/src/plugins/qmlprofiler/qml/Overview.qml
index 3e2a3183abb..f5ebcc1677f 100644
--- a/src/plugins/qmlprofiler/qml/Overview.qml
+++ b/src/plugins/qmlprofiler/qml/Overview.qml
@@ -29,7 +29,6 @@
****************************************************************************/
import QtQuick 2.1
-import Monitor 1.0
import "Overview.js" as Plotter
Canvas {
diff --git a/src/plugins/qmlprofiler/qml/RangeDetails.qml b/src/plugins/qmlprofiler/qml/RangeDetails.qml
index 7bab74a0cfe..678c2588824 100644
--- a/src/plugins/qmlprofiler/qml/RangeDetails.qml
+++ b/src/plugins/qmlprofiler/qml/RangeDetails.qml
@@ -29,7 +29,6 @@
****************************************************************************/
import QtQuick 2.1
-import Monitor 1.0
Item {
id: rangeDetails
diff --git a/src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml b/src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml
index 9e8dfcff093..e4e2b612d3d 100644
--- a/src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml
+++ b/src/plugins/qmlprofiler/qml/SelectionRangeDetails.qml
@@ -29,7 +29,6 @@
****************************************************************************/
import QtQuick 2.1
-import Monitor 1.0
Item {
id: selectionRangeDetails
diff --git a/src/plugins/qmlprofiler/qml/TimelineContent.qml b/src/plugins/qmlprofiler/qml/TimelineContent.qml
index 39593f9a454..998c5c108ba 100644
--- a/src/plugins/qmlprofiler/qml/TimelineContent.qml
+++ b/src/plugins/qmlprofiler/qml/TimelineContent.qml
@@ -30,7 +30,7 @@
import QtQuick 2.0
import QtQuick.Controls 1.2
-import Monitor 1.0
+import TimelineRenderer 1.0
import QtQml.Models 2.1
ScrollView {