From e96e84b6c3d45440b7e95f3090299b3f7928ec95 Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@digia.com>
Date: Tue, 3 Sep 2013 12:59:50 +0200
Subject: [PATCH] QmlProfiler: Rename Label to CategoryLabel

This is to avoid confusion with generic Label
Quick component.

Change-Id: I6a72266c394862706215b6db40bcd3592f9d24b3
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
---
 src/plugins/qmlprofiler/qml/{Label.qml => CategoryLabel.qml} | 0
 src/plugins/qmlprofiler/qml/MainView.qml                     | 2 +-
 src/plugins/qmlprofiler/qml/qmlprofiler.qrc                  | 2 +-
 src/plugins/qmlprofiler/qmlprofiler.pro                      | 2 +-
 src/plugins/qmlprofiler/qmlprofiler.qbs                      | 2 +-
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/plugins/qmlprofiler/qml/{Label.qml => CategoryLabel.qml} (100%)

diff --git a/src/plugins/qmlprofiler/qml/Label.qml b/src/plugins/qmlprofiler/qml/CategoryLabel.qml
similarity index 100%
rename from src/plugins/qmlprofiler/qml/Label.qml
rename to src/plugins/qmlprofiler/qml/CategoryLabel.qml
diff --git a/src/plugins/qmlprofiler/qml/MainView.qml b/src/plugins/qmlprofiler/qml/MainView.qml
index 82a77d6bcc5..f06e88af941 100644
--- a/src/plugins/qmlprofiler/qml/MainView.qml
+++ b/src/plugins/qmlprofiler/qml/MainView.qml
@@ -533,7 +533,7 @@ Rectangle {
             id: col
             Repeater {
                 model: labels.rowCount
-                delegate: Label { }
+                delegate: CategoryLabel { }
             }
         }
     }
diff --git a/src/plugins/qmlprofiler/qml/qmlprofiler.qrc b/src/plugins/qmlprofiler/qml/qmlprofiler.qrc
index ab3f8598da0..1e45c140656 100644
--- a/src/plugins/qmlprofiler/qml/qmlprofiler.qrc
+++ b/src/plugins/qmlprofiler/qml/qmlprofiler.qrc
@@ -1,7 +1,7 @@
 <RCC>
     <qresource prefix="/qmlprofiler">
         <file>Detail.qml</file>
-        <file>Label.qml</file>
+        <file>CategoryLabel.qml</file>
         <file>MainView.qml</file>
         <file>RangeDetails.qml</file>
         <file>RangeMover.qml</file>
diff --git a/src/plugins/qmlprofiler/qmlprofiler.pro b/src/plugins/qmlprofiler/qmlprofiler.pro
index f5b68699d5d..8be84235331 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.pro
+++ b/src/plugins/qmlprofiler/qmlprofiler.pro
@@ -69,7 +69,7 @@ RESOURCES += \
 
 OTHER_FILES += \
     qml/Detail.qml \
-    qml/Label.qml \
+    qml/CategoryLabel.qml \
     qml/MainView.qml \
     qml/RangeDetails.qml \
     qml/RangeMover.qml \
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index ab92e9d590e..507ce1093e7 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -71,7 +71,7 @@ QtcPlugin {
         prefix: "qml/"
         files: [
             "Detail.qml",
-            "Label.qml",
+            "CategoryLabel.qml",
             "MainView.qml",
             "Overview.js",
             "Overview.qml",