diff options
| author | Aurindam Jana <aurindam.jana@digia.com> | 2013-09-03 12:56:29 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-09-18 10:37:33 +0200 |
| commit | c9a851c64993412d5a10bef9e6ab324fe5b4d974 (patch) | |
| tree | 5358a5d80dc6c8c5c0da94486ad18055f77896e5 /src | |
| parent | a2d771b41e4ce604550b1bf5ba96cc07f40c3b72 (diff) | |
| download | qt-creator-c9a851c64993412d5a10bef9e6ab324fe5b4d974.tar.gz | |
QmlProfiler: Avoid generic property types in QML
Change-Id: I4dddf19d37004f59bfbe75b45e0b626bf1563fa2
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/qmlprofiler/qml/Label.qml | 6 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/qml/MainView.qml | 8 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/qml/Overview.qml | 4 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/qml/RangeDetails.qml | 2 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/qml/SelectionRange.qml | 18 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/qml/TimeDisplay.qml | 6 | ||||
| -rw-r--r-- | src/plugins/qmlprofiler/qml/TimeMarks.qml | 6 |
7 files changed, 25 insertions, 25 deletions
diff --git a/src/plugins/qmlprofiler/qml/Label.qml b/src/plugins/qmlprofiler/qml/Label.qml index c1a6c3afe7..f8cc12d859 100644 --- a/src/plugins/qmlprofiler/qml/Label.qml +++ b/src/plugins/qmlprofiler/qml/Label.qml @@ -36,9 +36,9 @@ Item { property int categoryIndex: qmlProfilerModelProxy.correctedCategoryIndexForModel(modelIndex, index) property int modelIndex: qmlProfilerModelProxy.modelIndexForCategory(index); - property variant descriptions: [] - property variant extdescriptions: [] - property variant eventIds: [] + property var descriptions: [] + property var extdescriptions: [] + property var eventIds: [] visible: qmlProfilerModelProxy.categoryDepth(modelIndex, categoryIndex) > 0; diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml index 4f5a9e7de5..82a77d6bcc 100644 --- a/src/plugins/qmlprofiler/qml/MainView.qml +++ b/src/plugins/qmlprofiler/qml/MainView.qml @@ -51,7 +51,7 @@ Rectangle { signal selectedEventChanged(int eventId) property bool lockItemSelection : false - property variant mainviewTimePerPixel : 0 + property real mainviewTimePerPixel : 0 signal updateCursorPosition property string fileName: "" @@ -62,8 +62,8 @@ Rectangle { property bool selectionRangeMode: false property bool selectionRangeReady: selectionRange.ready - property variant selectionRangeStart: selectionRange.startTime - property variant selectionRangeEnd: selectionRange.startTime + selectionRange.duration + property real selectionRangeStart: selectionRange.startTime + property real selectionRangeEnd: selectionRange.startTime + selectionRange.duration signal changeToolTip(string text) signal updateVerticalScroll(int newPosition) @@ -410,7 +410,7 @@ Rectangle { width: flick.width height: root.height - property variant startX: 0 + property real startX: 0 onStartXChanged: { var newStartTime = Math.round(startX * (endTime - startTime) / flick.width) + qmlProfilerModelProxy.traceStartTime(); diff --git a/src/plugins/qmlprofiler/qml/Overview.qml b/src/plugins/qmlprofiler/qml/Overview.qml index 05b99bee9b..bf94a56a09 100644 --- a/src/plugins/qmlprofiler/qml/Overview.qml +++ b/src/plugins/qmlprofiler/qml/Overview.qml @@ -37,8 +37,8 @@ Canvas2D { // ***** properties height: 50 property bool dataReady: false - property variant startTime : 0 - property variant endTime : 0 + property real startTime : 0 + property real endTime : 0 // ***** functions function clearDisplay() diff --git a/src/plugins/qmlprofiler/qml/RangeDetails.qml b/src/plugins/qmlprofiler/qml/RangeDetails.qml index e0d2460dd8..2fe6e398f2 100644 --- a/src/plugins/qmlprofiler/qml/RangeDetails.qml +++ b/src/plugins/qmlprofiler/qml/RangeDetails.qml @@ -65,7 +65,7 @@ Item { onCandidateHeightChanged: fitInView(); } - //property variant eventInfo + //property int eventInfo ListModel { id: eventInfo diff --git a/src/plugins/qmlprofiler/qml/SelectionRange.qml b/src/plugins/qmlprofiler/qml/SelectionRange.qml index 7cbf86b8a5..1e12458c7e 100644 --- a/src/plugins/qmlprofiler/qml/SelectionRange.qml +++ b/src/plugins/qmlprofiler/qml/SelectionRange.qml @@ -47,15 +47,15 @@ Rectangle { property string endTimeString: detailedPrintTime(startTime+duration) property string durationString: detailedPrintTime(duration) - property variant startTime: x * selectionRange.viewTimePerPixel + qmlProfilerModelProxy.traceStartTime() - property variant duration: width * selectionRange.viewTimePerPixel - property variant viewTimePerPixel: 1 - property variant creationState : 0 - - property variant x1 - property variant x2 - property variant x3: Math.min(x1, x2) - property variant x4: Math.max(x1, x2) + property real startTime: x * selectionRange.viewTimePerPixel + qmlProfilerModelProxy.traceStartTime() + property real duration: width * selectionRange.viewTimePerPixel + property real viewTimePerPixel: 1 + property int creationState : 0 + + property real x1 + property real x2 + property real x3: Math.min(x1, x2) + property real x4: Math.max(x1, x2) property bool isDragging: false diff --git a/src/plugins/qmlprofiler/qml/TimeDisplay.qml b/src/plugins/qmlprofiler/qml/TimeDisplay.qml index d93de6e65d..b962222481 100644 --- a/src/plugins/qmlprofiler/qml/TimeDisplay.qml +++ b/src/plugins/qmlprofiler/qml/TimeDisplay.qml @@ -33,9 +33,9 @@ import Monitor 1.0 Canvas2D { id: timeDisplay - property variant startTime : 0 - property variant endTime : 0 - property variant timePerPixel: 0 + property real startTime : 0 + property real endTime : 0 + property real timePerPixel: 0 Component.onCompleted: { diff --git a/src/plugins/qmlprofiler/qml/TimeMarks.qml b/src/plugins/qmlprofiler/qml/TimeMarks.qml index 7eda6e4bc4..bee2288a30 100644 --- a/src/plugins/qmlprofiler/qml/TimeMarks.qml +++ b/src/plugins/qmlprofiler/qml/TimeMarks.qml @@ -33,9 +33,9 @@ import Monitor 1.0 Canvas2D { id: timeDisplay - property variant startTime - property variant endTime - property variant timePerPixel + property real startTime + property real endTime + property real timePerPixel Component.onCompleted: { requestRedraw(); |
