From d8210098225155817fc58b3e82d899f7856a8c7a Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@theqtcompany.com>
Date: Thu, 20 Nov 2014 11:04:42 +0100
Subject: Properly initialize max size in memory usage model

Change-Id: Id77917c92191d3970727be0b360abefc87254c5b
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
---
 plugins/qmlprofilerextension/memoryusagemodel.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp
index e61ee36683..5a83899cd7 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.cpp
+++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp
@@ -44,6 +44,8 @@ MemoryUsageModel::MemoryUsageModel(QObject *parent)
                             tr(QmlProfilerModelManager::featureName(QmlDebug::ProfileMemory)),
                             QmlDebug::MemoryAllocation, QmlDebug::MaximumRangeType, parent)
 {
+    Q_D(MemoryUsageModel);
+    d->maxSize = 1;
 }
 
 quint64 MemoryUsageModel::features() const
-- 
cgit v1.2.3


From bfc37d69732e1a504f4bb834001885e1407f9552 Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@theqtcompany.com>
Date: Mon, 24 Nov 2014 11:27:00 +0100
Subject: Add qbs project file.

Change-Id: If583799f3dfd09c6c5c49ee8305c0df8b038881a
Reviewed-by: Ulf Hermann <ulf.hermann@theqtcompany.com>
---
 .../qmlprofilerextension/qmlprofilerextension.qbs  | 26 ++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 plugins/qmlprofilerextension/qmlprofilerextension.qbs

diff --git a/plugins/qmlprofilerextension/qmlprofilerextension.qbs b/plugins/qmlprofilerextension/qmlprofilerextension.qbs
new file mode 100644
index 0000000000..337461372e
--- /dev/null
+++ b/plugins/qmlprofilerextension/qmlprofilerextension.qbs
@@ -0,0 +1,26 @@
+import qbs
+
+QtcPlugin {
+    name: "QmlProfilerExtension"
+
+    Depends { name: "Core" }
+    Depends { name: "LicenseChecker" }
+    Depends { name: "QmlProfiler" }
+
+    Depends { name: "Qt.widgets" }
+
+    files: [
+        "inputeventsmodel.cpp",
+        "inputeventsmodel.h",
+        "memoryusagemodel.cpp",
+        "memoryusagemodel.h",
+        "pixmapcachemodel.cpp",
+        "pixmapcachemodel.h",
+        "qmlprofilerextensionconstants.h",
+        "qmlprofilerextensionplugin.cpp",
+        "qmlprofilerextensionplugin.h",
+        "qmlprofilerextension_global.h",
+        "scenegraphtimelinemodel.cpp",
+        "scenegraphtimelinemodel.h",
+    ]
+}
-- 
cgit v1.2.3