Merge remote-tracking branch 'origin/3.3'

Conflicts:
	plugins/qmlprofilerextension/memoryusagemodel.cpp

Change-Id: I444eb11c167cd44b3e68cbe34210d3bcdf039cb4

2 files changed, 27 insertions, 0 deletions

diff --git a/plugins/qmlprofilerextension/memoryusagemodel.cpp b/plugins/qmlprofilerextension/memoryusagemodel.cpp
index 189913d0a8..516bcc2c03 100644
--- a/plugins/qmlprofilerextension/memoryusagemodel.cpp
+++ b/plugins/qmlprofilerextension/memoryusagemodel.cpp
@@ -32,6 +32,7 @@ MemoryUsageModel::MemoryUsageModel(QmlProfilerModelManager *manager, QObject *pa
                              tr(QmlProfilerModelManager::featureName(QmlDebug::ProfileMemory)),
                              QmlDebug::MemoryAllocation, QmlDebug::MaximumRangeType, parent)
 {
+    m_maxSize = 1;
     announceFeatures((1 << QmlDebug::ProfileMemory) | QmlDebug::Constants::QML_JS_RANGE_FEATURES);
 }
 
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",
+    ]
+}