diff --git a/src/plugins/qmlprofilerextension/FlameGraphView.qml b/src/plugins/qmlprofilerextension/FlameGraphView.qml index 7cb4fb5f5fcde61485d72402b0169dcbc56450c6..9cd8c9a674b7979c2eb66f3859e9ecc5b41d353e 100644 --- a/src/plugins/qmlprofilerextension/FlameGraphView.qml +++ b/src/plugins/qmlprofilerextension/FlameGraphView.qml @@ -24,7 +24,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 1.4 +import QtQuick.Controls 1.3 import FlameGraph 1.0 import FlameGraphModel 1.0 diff --git a/src/plugins/qmlprofilerextension/flamegraphmodel.h b/src/plugins/qmlprofilerextension/flamegraphmodel.h index 06b5b042e15cfd5151c514987a4fef511939d6c8..38d04743fe2a0569c824c5f46c6140007038eb42 100644 --- a/src/plugins/qmlprofilerextension/flamegraphmodel.h +++ b/src/plugins/qmlprofilerextension/flamegraphmodel.h @@ -78,7 +78,7 @@ public: QModelIndex index(int row, int column, const QModelIndex &parent) const override; QModelIndex parent(const QModelIndex &child) const override; - int rowCount(const QModelIndex &parent) const override; + Q_INVOKABLE int rowCount(const QModelIndex &parent = QModelIndex()) const override; int columnCount(const QModelIndex &parent) const override; QVariant data(const QModelIndex &index, int role) const override; QHash roleNames() const override; diff --git a/src/plugins/qmlprofilerextension/flamegraphview.cpp b/src/plugins/qmlprofilerextension/flamegraphview.cpp index 532f9718bbc16ba81b2a7df8a028e86fc0185291..26b08d994025ac651a9f08314f78495aad4fd474 100644 --- a/src/plugins/qmlprofilerextension/flamegraphview.cpp +++ b/src/plugins/qmlprofilerextension/flamegraphview.cpp @@ -46,6 +46,8 @@ FlameGraphView::FlameGraphView(QWidget *parent, QmlProfiler::QmlProfilerModelMan qmlRegisterType("FlameGraph", 1, 0, "FlameGraph"); qmlRegisterUncreatableType("FlameGraphModel", 1, 0, "FlameGraphModel", QLatin1String("use the context property")); + qmlRegisterUncreatableType("AbstractItemModel", 1, 0, "AbstractItemModel", + QLatin1String("only for Qt 5.4")); m_content->rootContext()->setContextProperty(QStringLiteral("flameGraphModel"), m_model); m_content->setSource(QUrl(QStringLiteral("qrc:/FlameGraphView.qml")));