diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml index 349a3ea8002..e08c25336f6 100644 --- a/src/plugins/qmlprofiler/qml/MainView.qml +++ b/src/plugins/qmlprofiler/qml/MainView.qml @@ -42,8 +42,6 @@ Rectangle { property bool xRay: false //useful for seeing "nested" ranges (but redraw is buggy -- QGV problem?) property Item currentItem //currently selected item in the view - property bool zooming:false - // move the cursor in the editor signal updateCursorPosition property string fileName: "" @@ -184,10 +182,8 @@ Rectangle { property real prevXStep: -1 property real possibleEndTime: startTime + (rangeMover.width*Plotter.xScale(canvas)) onPossibleEndTimeChanged: { - var set = ((zooming && prevXStep != canvas.canvasWindow.x) || !zooming); prevXStep = canvas.canvasWindow.x; - if (set) - endTime = possibleEndTime + endTime = possibleEndTime } onEndTimeChanged: updateTimeline() diff --git a/src/plugins/qmlprofiler/qml/RangeMover.qml b/src/plugins/qmlprofiler/qml/RangeMover.qml index 6dfff9d9efa..8617b3399ee 100644 --- a/src/plugins/qmlprofiler/qml/RangeMover.qml +++ b/src/plugins/qmlprofiler/qml/RangeMover.qml @@ -42,10 +42,8 @@ Item { property real prevXStep: -1 property real possibleValue: (canvas.canvasWindow.x + x) * Plotter.xScale(canvas) onPossibleValueChanged: { - var set = (!zooming || (zooming && prevXStep != canvas.canvasWindow.x)) prevXStep = canvas.canvasWindow.x; - if (set) - value = possibleValue + value = possibleValue } property real value diff --git a/src/plugins/qmlprofiler/qml/RecordButton.qml b/src/plugins/qmlprofiler/qml/RecordButton.qml deleted file mode 100644 index 94da658e72b..00000000000 --- a/src/plugins/qmlprofiler/qml/RecordButton.qml +++ /dev/null @@ -1,86 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2011 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (info@qt.nokia.com) -** -** No Commercial Usage -** -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** 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, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at info@qt.nokia.com. -** -**************************************************************************/ - -import QtQuick 1.0 - -Rectangle { - id: button - - property alias text: textItem.text - property bool recording: false - - signal clicked - - width: 80; height: textItem.height + 8 - border.width: 1 - border.color: Qt.darker(button.color, 1.4) - radius: height/2 - smooth: true - - color: "#049e0e" - - Text { - id: textItem - anchors.centerIn: parent - font.pixelSize: 14 - color: "white" - text: "Recording" - } - - MouseArea { - id: mouseArea - anchors.fill: parent - onClicked: { - recording = !recording; - button.clicked() - } - } - - StateGroup { - id: recordState - states: State { - name: "recording" - when: recording - PropertyChanges { target: button; color: "#ff120c"; } - PropertyChanges { target: textItem; text: "Stop" } - } - } - - StateGroup { - states: State { - name: "pressed"; when: mouseArea.pressed && mouseArea.containsMouse - PropertyChanges { target: button; color: Qt.darker(color, 1.1); explicit: true } - PropertyChanges { target: textItem; x: textItem.x + 1; y: textItem.y + 1; explicit: true } - } - } -} diff --git a/src/plugins/qmlprofiler/qml/qml.qrc b/src/plugins/qmlprofiler/qml/qml.qrc index 8e8291ac349..0befcb5b062 100644 --- a/src/plugins/qmlprofiler/qml/qml.qrc +++ b/src/plugins/qmlprofiler/qml/qml.qrc @@ -9,7 +9,6 @@ range.png RangeDetails.qml RangeMover.qml - RecordButton.qml ToolButton.qml analyzer_category_small.png TimeDisplay.qml diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro index 0527326edf8..57281e14674 100644 --- a/src/plugins/qmlprofiler/qmlprofiler.pro +++ b/src/plugins/qmlprofiler/qmlprofiler.pro @@ -51,7 +51,6 @@ OTHER_FILES += \ qml/MainView.qml \ qml/RangeDetails.qml \ qml/RangeMover.qml \ - qml/RecordButton.qml \ qml/ToolButton.qml \ qml/MainView.js \ qml/TimeDisplay.qml