summaryrefslogtreecommitdiff
path: root/src/plugins/qmlprofiler/qmlprofiler.qbs
diff options
context:
space:
mode:
authorErik Verbruggen <erik.verbruggen@digia.com>2013-12-10 12:53:20 +0100
committerErik Verbruggen <erik.verbruggen@digia.com>2013-12-10 12:53:20 +0100
commit9f831dde07cb2411808534e76669b28a1b76e21d (patch)
treeed6252d64c9a3ab27aa93786272cda1b6008f3c7 /src/plugins/qmlprofiler/qmlprofiler.qbs
parentcdac81f896ef4b052d76f96485a08e6ec13696b8 (diff)
parentea1a92484ac99057b06130a012164bf9788650e9 (diff)
downloadqt-creator-wip/clang.tar.gz
Merge remote-tracking branch 'origin/master' into wip/clangwip/clang
Change-Id: I8a2c8068a3f2b15034fb1bf6304c9a0f3f0e3c8f
Diffstat (limited to 'src/plugins/qmlprofiler/qmlprofiler.qbs')
-rw-r--r--src/plugins/qmlprofiler/qmlprofiler.qbs12
1 files changed, 1 insertions, 11 deletions
diff --git a/src/plugins/qmlprofiler/qmlprofiler.qbs b/src/plugins/qmlprofiler/qmlprofiler.qbs
index 507ce1093e..018019c49a 100644
--- a/src/plugins/qmlprofiler/qmlprofiler.qbs
+++ b/src/plugins/qmlprofiler/qmlprofiler.qbs
@@ -50,23 +50,13 @@ QtcPlugin {
"qmlprofilerviewmanager.cpp", "qmlprofilerviewmanager.h",
"qv8profilerdatamodel.cpp", "qv8profilerdatamodel.h",
"qv8profilereventview.h", "qv8profilereventview.cpp",
+ "sortedtimelinemodel.h", "sortedtimelinemodel.cpp",
"timelinemodelaggregator.cpp", "timelinemodelaggregator.h",
"timelinerenderer.cpp", "timelinerenderer.h",
]
}
Group {
- name: "Canvas"
- prefix: "canvas/"
- files: [
- "qdeclarativecanvas.cpp", "qdeclarativecanvas_p.h",
- "qdeclarativecanvastimer.cpp", "qdeclarativecanvastimer_p.h",
- "qdeclarativecontext2d.cpp", "qdeclarativecontext2d_p.h",
- "qmlprofilercanvas.cpp", "qmlprofilercanvas.h"
- ]
- }
-
- Group {
name: "QML"
prefix: "qml/"
files: [