Merge branch 'master' of scm.dev.nokia.troll.no:creator/mainline

82ce382f · con · 3de823ca · 7a25f6c3 · 82ce382f · 82ce382f
Commit 82ce382f authored 14 years ago by con
--- a/src/plugins/qmlprofiler/Detail.qml
+++ b/src/plugins/qmlprofiler/Detail.qml
--- a/src/plugins/qmlprofiler/Label.qml
+++ b/src/plugins/qmlprofiler/Label.qml
--- a/src/plugins/qmlprofiler/MainView.js
+++ b/src/plugins/qmlprofiler/MainView.js
--- a/src/plugins/qmlprofiler/MainView.qml
+++ b/src/plugins/qmlprofiler/MainView.qml
--- a/src/plugins/qmlprofiler/RangeDetails.qml
+++ b/src/plugins/qmlprofiler/RangeDetails.qml
--- a/src/plugins/qmlprofiler/RangeMover.qml
+++ b/src/plugins/qmlprofiler/RangeMover.qml
--- a/src/plugins/qmlprofiler/RecordButton.qml
+++ b/src/plugins/qmlprofiler/RecordButton.qml
--- a/src/plugins/qmlprofiler/ToolButton.qml
+++ b/src/plugins/qmlprofiler/ToolButton.qml
--- a/src/plugins/qmlprofiler/lock.png
+++ b/src/plugins/qmlprofiler/lock.png
--- a/src/plugins/qmlprofiler/popup.png
+++ b/src/plugins/qmlprofiler/popup.png
--- a/src/plugins/qmlprofiler/qmlprofiler.qrc
+++ b/src/plugins/qmlprofiler/qmlprofiler.qrc
--- a/src/plugins/qmlprofiler/range.png
+++ b/src/plugins/qmlprofiler/range.png
--- a/src/plugins/qmlprofiler/qmlprofiler.pro
+++ b/src/plugins/qmlprofiler/qmlprofiler.pro
@@ -30,7 +30,7 @@ HEADERS += \
    timelineview.h

 RESOURCES += \
-    qmlprofiler.qrc
+    qml/qml.qrc

 OTHER_FILES += \
    Detail.qml \