feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlProfiler: Rename Label to CategoryLabel

Browse Source 
This is to avoid confusion with generic Label
Quick component.

Change-Id: I6a72266c394862706215b6db40bcd3592f9d24b3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
This commit is contained in:
Aurindam Jana
2013-09-03 12:59:50 +02:00
parent 92008f4b6a
commit e96e84b6c3
5 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/plugins/qmlprofiler/qml/Label.qml → src/plugins/qmlprofiler/qml/CategoryLabel.qml
View File

2
src/plugins/qmlprofiler/qml/MainView.qml
View File

@@ -533,7 +533,7 @@ Rectangle {
id: col id: col
Repeater { Repeater {
model: labels.rowCount model: labels.rowCount
delegate: Label { } delegate: CategoryLabel { }
} }
} }
} }

2
src/plugins/qmlprofiler/qml/qmlprofiler.qrc
View File

@@ -1,7 +1,7 @@
<RCC> <RCC>
<qresource prefix="/qmlprofiler"> <qresource prefix="/qmlprofiler">
<file>Detail.qml</file> <file>Detail.qml</file>
<file>Label.qml</file> <file>CategoryLabel.qml</file>
<file>MainView.qml</file> <file>MainView.qml</file>
<file>RangeDetails.qml</file> <file>RangeDetails.qml</file>
<file>RangeMover.qml</file> <file>RangeMover.qml</file>

2
src/plugins/qmlprofiler/qmlprofiler.pro
View File

@@ -69,7 +69,7 @@ RESOURCES += \
OTHER_FILES += \ OTHER_FILES += \
qml/Detail.qml \ qml/Detail.qml \
qml/Label.qml \ qml/CategoryLabel.qml \
qml/MainView.qml \ qml/MainView.qml \
qml/RangeDetails.qml \ qml/RangeDetails.qml \
qml/RangeMover.qml \ qml/RangeMover.qml \

2
src/plugins/qmlprofiler/qmlprofiler.qbs
View File

@@ -71,7 +71,7 @@ QtcPlugin {
prefix: "qml/" prefix: "qml/"
files: [ files: [
"Detail.qml", "Detail.qml",
"Label.qml", "CategoryLabel.qml",
"MainView.qml", "MainView.qml",
"Overview.js", "Overview.js",
"Overview.qml", "Overview.qml",