From 7768c3fc60b8b4ace9f0e83c3b5e713363ccd9f7 2013-10-02 06:29:41
From: Titta Heikkala <titta.heikkala@digia.com>
Date: 2013-10-02 06:29:41
Subject: [PATCH] Remove qmlcustommodel demo

Qml Custom Model demo removed for now. If there's need for similar demo
in the future a better one should be created.

Task-number: QTRD-1928
Change-Id: I1766dfca4e2a7358f47c40f0e0b7258768c16b22
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>

---

diff --git a/demos/qmlcustommodel/customtablemodel.cpp b/demos/qmlcustommodel/customtablemodel.cpp
deleted file mode 100644
index d67dc90..0000000
--- a/demos/qmlcustommodel/customtablemodel.cpp
+++ /dev/null
@@ -1,136 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "customtablemodel.h"
-#include <QVector>
-#include <QRect>
-#include <QColor>
-#include <QDebug>
-
-CustomTableModel::CustomTableModel(QObject *parent) :
-    QAbstractTableModel(parent),
-    m_columnCount(0),
-    m_rowCount(0)
-{
-}
-
-int CustomTableModel::rowCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent)
-    return m_data.count();
-}
-
-int CustomTableModel::columnCount(const QModelIndex &parent) const
-{
-    Q_UNUSED(parent)
-    return m_columnCount;
-}
-
-QVariant CustomTableModel::headerData(int section, Qt::Orientation orientation, int role) const
-{
-    if (role != Qt::DisplayRole)
-        return QVariant();
-
-    if (orientation == Qt::Vertical) {
-        if (m_verticalHeaders.count() > section)
-            return m_verticalHeaders[section];
-        else
-            return QAbstractTableModel::headerData(section, orientation, role);
-    } else {
-        return QAbstractTableModel::headerData(section, orientation, role);
-    }
-}
-
-bool CustomTableModel::setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role)
-{
-    if (orientation == Qt::Vertical) {
-        while (m_verticalHeaders.count() <= section)
-            m_verticalHeaders.append(QVariant());
-        m_verticalHeaders.replace(section, value);
-    } else {
-        return QAbstractTableModel::setHeaderData(section, orientation, value, role);
-    }
-    emit headerDataChanged(orientation, section, section);
-    return true;
-}
-
-QVariant CustomTableModel::data(const QModelIndex &index, int role) const
-{
-    if (role == Qt::DisplayRole) {
-        return m_data[index.row()]->at(index.column());
-    } else if (role == Qt::EditRole) {
-        return m_data[index.row()]->at(index.column());
-    }
-    return QVariant();
-}
-
-bool CustomTableModel::setData(const QModelIndex &index, const QVariant &value, int role)
-{
-    if (index.isValid() && role == Qt::EditRole) {
-        m_data[index.row()]->replace(index.column(), value);
-        emit dataChanged(index, index);
-        return true;
-    }
-    return false;
-}
-
-QVariant CustomTableModel::at(int row, int column)
-{
-    return data(index(row, column));
-}
-
-void CustomTableModel::insertColumn(int column, const QModelIndex &parent)
-{
-    beginInsertColumns(parent, column, column);
-    m_columnCount++;
-    endInsertColumns();
-}
-
-void CustomTableModel::insertRow(int row, const QModelIndex &parent)
-{
-    beginInsertRows(parent, row, row);
-    QVector<QVariant>* dataVec = new QVector<QVariant>(m_columnCount);
-    m_data.insert(row, dataVec);
-    endInsertRows();
-}
-
-bool CustomTableModel::removeRow(int row, const QModelIndex &parent)
-{
-    return QAbstractTableModel::removeRow(row, parent);
-}
-
-bool CustomTableModel::removeRows(int row, int count, const QModelIndex &parent)
-{
-    beginRemoveRows(parent, row, row + count - 1);
-    bool removed(false);
-    for (int i(row); i < (row + count); i++) {
-        m_data.removeAt(i);
-        removed = true;
-    }
-    endRemoveRows();
-    return removed;
-}
-
-Qt::ItemFlags CustomTableModel::flags(const QModelIndex &index) const
-{
-    return QAbstractItemModel::flags(index) | Qt::ItemIsEditable;
-}
-
-#include "moc_customtablemodel.cpp"
diff --git a/demos/qmlcustommodel/customtablemodel.h b/demos/qmlcustommodel/customtablemodel.h
deleted file mode 100644
index 3aa8366..0000000
--- a/demos/qmlcustommodel/customtablemodel.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef CUSTOMTABLEMODEL_H
-#define CUSTOMTABLEMODEL_H
-
-#include <QAbstractTableModel>
-#include <QHash>
-
-class CustomTableModel : public QAbstractTableModel
-{
-    Q_OBJECT
-    Q_PROPERTY(int rowCount READ rowCount)
-    Q_PROPERTY(int columnCount READ columnCount)
-
-public:
-    explicit CustomTableModel(QObject *parent = 0);
-
-    int rowCount(const QModelIndex &parent = QModelIndex()) const;
-    int columnCount(const QModelIndex &parent = QModelIndex()) const;
-    QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const;
-    bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role = Qt::EditRole);
-    QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const;
-    bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
-    Qt::ItemFlags flags(const QModelIndex &index) const;
-    void insertColumn(int column, const QModelIndex &parent = QModelIndex());
-    void insertRow(int row, const QModelIndex &parent = QModelIndex());
-    Q_INVOKABLE bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
-    Q_INVOKABLE bool removeRow(int row, const QModelIndex &parent = QModelIndex());
-    Q_INVOKABLE QVariant at(int row, int column);
-
-private:
-    QList<QVector<QVariant> * > m_data;
-    QList<QVariant> m_verticalHeaders;
-    int m_columnCount;
-    int m_rowCount;
-};
-
-#endif // CUSTOMTABLEMODEL_H
diff --git a/demos/qmlcustommodel/declarativemodel.cpp b/demos/qmlcustommodel/declarativemodel.cpp
deleted file mode 100644
index e7795e0..0000000
--- a/demos/qmlcustommodel/declarativemodel.cpp
+++ /dev/null
@@ -1,110 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include "declarativemodel.h"
-#include <qdeclarativelist.h>
-#include <QStringList>
-#include <QDebug>
-
-////////////// Table model element ///////////////////
-
-DeclarativeTableModelElement::DeclarativeTableModelElement(QObject *parent)
-    : QObject(parent)
-{
-}
-
-QVariantList DeclarativeTableModelElement::values()
-{
-    return m_values;
-}
-
-void DeclarativeTableModelElement::setValues(QVariantList values)
-{
-    m_values = values;
-}
-
-////////////// Table model  ///////////////////
-
-DeclarativeTableModel::DeclarativeTableModel(QObject *parent) :
-    CustomTableModel(parent)
-{
-}
-
-void DeclarativeTableModel::classBegin()
-{
-}
-
-void DeclarativeTableModel::componentComplete()
-{
-    foreach (QObject *child, children()) {
-        if (qobject_cast<DeclarativeTableModelElement *>(child)) {
-            DeclarativeTableModelElement *element = qobject_cast<DeclarativeTableModelElement *>(child);
-            append(element->values());
-        }
-    }
-}
-
-void DeclarativeTableModel::setVerticalHeaders(QStringList headers)
-{
-    for (int i(0); i < headers.count(); i++)
-        setHeaderData(i, Qt::Vertical, headers.at(i));
-}
-
-QStringList DeclarativeTableModel::verticalHeaders()
-{
-    return QStringList();
-}
-
-QDeclarativeListProperty<QObject> DeclarativeTableModel::modelChildren()
-{
-    return QDeclarativeListProperty<QObject>(this, 0, &DeclarativeTableModel::appendModelChild);
-}
-
-void DeclarativeTableModel::appendModelChild(QDeclarativeListProperty<QObject> *list,
-                                             QObject *child)
-{
-    // children are added in componentComplete instead
-    Q_UNUSED(list)
-    Q_UNUSED(child)
-}
-
-void DeclarativeTableModel::append(QVariantList values)
-{
-//    qDebug() << "DeclarativeTableModel::append:" << values;
-
-    while (columnCount() < values.count())
-        insertColumn(columnCount());
-
-    insertRow(rowCount());
-
-    QModelIndex beginIndex = QModelIndex();
-    QModelIndex endIndex = QModelIndex();
-    for (int i(0); i < values.count(); i++) {
-        QModelIndex modelIndex = createIndex(rowCount() - 1, i);
-        if (i == 0)
-            beginIndex = modelIndex;
-        if (i == (values.count() - 1))
-            endIndex = modelIndex;
-        setData(modelIndex, values.at(i));
-    }
-    dataChanged(beginIndex, endIndex);
-}
-
-#include "moc_declarativemodel.cpp"
diff --git a/demos/qmlcustommodel/declarativemodel.h b/demos/qmlcustommodel/declarativemodel.h
deleted file mode 100644
index 4c671d0..0000000
--- a/demos/qmlcustommodel/declarativemodel.h
+++ /dev/null
@@ -1,66 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#ifndef DECLARATIVEMODEL_H
-#define DECLARATIVEMODEL_H
-
-#include "customtablemodel.h"
-#include <QDeclarativeListProperty>
-#include <QVariant>
-#include <QDeclarativeParserStatus>
-
-class DeclarativeTableModelElement : public QObject
-{
-    Q_OBJECT
-    Q_PROPERTY(QVariantList values READ values WRITE setValues)
-
-public:
-    explicit DeclarativeTableModelElement(QObject *parent = 0);
-    QVariantList values();
-    void setValues(QVariantList values);
-private:
-    QVariantList m_values;
-};
-
-class DeclarativeTableModel : public CustomTableModel, public QDeclarativeParserStatus
-{
-    Q_OBJECT
-    Q_INTERFACES(QDeclarativeParserStatus)
-    Q_PROPERTY(QDeclarativeListProperty<QObject> modelChildren READ modelChildren)
-    Q_PROPERTY(QStringList verticalHeaders READ verticalHeaders WRITE setVerticalHeaders)
-    Q_CLASSINFO("DefaultProperty", "modelChildren")
-
-public:
-    explicit DeclarativeTableModel(QObject *parent = 0);
-    QDeclarativeListProperty<QObject> modelChildren();
-    void setVerticalHeaders(QStringList headers);
-    QStringList verticalHeaders();
-
-public: // from QDeclarativeParserStatus
-    void classBegin();
-    void componentComplete();
-
-public Q_SLOTS:
-    void append(QVariantList slices);
-    static void appendModelChild(QDeclarativeListProperty<QObject> *list,
-                                 QObject *element);
-};
-
-#endif // DECLARATIVEMODEL_H
diff --git a/demos/qmlcustommodel/main.cpp b/demos/qmlcustommodel/main.cpp
deleted file mode 100644
index e274f4e..0000000
--- a/demos/qmlcustommodel/main.cpp
+++ /dev/null
@@ -1,55 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-#include <QApplication>
-#include <QtDeclarative>
-#include <QtDeclarative/QDeclarativeEngine>
-#include <QAbstractItemModel>
-#include <QDir>
-#include "declarativemodel.h"
-#include "customtablemodel.h"
-#include "qmlapplicationviewer.h"
-
-const char *uri = "QmlCustomModel";
-
-Q_DECL_EXPORT int main(int argc, char *argv[])
-{
-    QScopedPointer<QApplication> app(createApplication(argc, argv));
-    QScopedPointer<QmlApplicationViewer> viewer(QmlApplicationViewer::create());
-#ifdef Q_OS_ANDROID
-    viewer->addImportPath(QString::fromLatin1("assets:/imports"));
-    viewer->engine()->addPluginPath(QString::fromLatin1("%1/../%2").arg(QDir::homePath(), QString::fromLatin1("lib")));
-#else
-    viewer->addImportPath(QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), QString::fromLatin1("imports")));
-#endif
-
-    // @uri QmlCustomModel
-    qmlRegisterUncreatableType<QAbstractItemModel>(uri, 1, 0, "AbstractItemModel",
-                                                   QLatin1String("Trying to create uncreatable: AbstractItemModel."));
-    qmlRegisterType<DeclarativeTableModel>(uri, 1, 0, "CustomModel");
-    qmlRegisterType<DeclarativeTableModelElement>(uri, 1, 0, "CustomModelElement");
-
-    // // viewer->setOrientation(QmlApplicationViewer::ScreenOrientationAuto);
-    viewer->setSource(QUrl("qrc:/qml/qmlcustommodel/loader.qml"));
-    viewer->setRenderHint(QPainter::Antialiasing, true);
-    viewer->showExpanded();
-
-    return app->exec();
-}
diff --git a/demos/qmlcustommodel/qml/qmlcustommodel/loader.qml b/demos/qmlcustommodel/qml/qmlcustommodel/loader.qml
deleted file mode 100644
index e035fca..0000000
--- a/demos/qmlcustommodel/qml/qmlcustommodel/loader.qml
+++ /dev/null
@@ -1,37 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-
-Item {
-    id: container
-    width: 400
-    height: 300
-    Component.onCompleted: {
-    var co = Qt.createComponent("main.qml")
-    if (co.status == Component.Ready) {
-            var o = co.createObject(container)
-        } else {
-            console.log(co.errorString())
-            console.log("QtCommercial.Chart 1.1 not available")
-            console.log("Please use correct QML_IMPORT_PATH export")
-         }
-    }
-}
diff --git a/demos/qmlcustommodel/qml/qmlcustommodel/main.qml b/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
deleted file mode 100644
index 6858477..0000000
--- a/demos/qmlcustommodel/qml/qmlcustommodel/main.qml
+++ /dev/null
@@ -1,183 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2013 Digia Plc
-** All rights reserved.
-** For any questions to Digia, please use contact form at http://qt.digia.com
-**
-** This file is part of the Qt Enterprise Charts Add-on.
-**
-** $QT_BEGIN_LICENSE$
-** Licensees holding valid Qt Enterprise licenses may use this file in
-** accordance with the Qt Enterprise License Agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and Digia.
-**
-** If you have questions regarding the use of this file, please use
-** contact form at http://qt.digia.com
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 1.0
-import QtCommercial.Chart 1.1
-import QmlCustomModel 1.0
-
-Rectangle {
-    anchors.fill: parent
-
-    //![1]
-    ChartView {
-        id: chartView
-        title: "Top-5 car brand shares in Finland"
-        anchors.fill: parent
-        animationOptions: ChartView.SeriesAnimations
-        
-        BarCategoriesAxis {
-            id: categoriesAxis
-            categories: ["2007", "2008", "2009", "2010", "2011", "2012", "2013", "2014" ]
-            min: "2007"
-            max: "2014"
-            titleText: "Year"
-        }
-
-        ValueAxis {
-            id: valueAxis
-            min: 0
-            max: 60
-            titleText: "Sales count [ku]"
-        }
-        // ...
-        //![1]
-
-        //![2]
-        CustomModel {
-            id: customModel
-            verticalHeaders: ["Manufacturer", "Volkswagen", "Toyota", "Ford", "Skoda", "Volvo", "Others"]
-            CustomModelElement { values: [0, "Manufacturer", 0, 1, 2, 3, 4] }
-            CustomModelElement { values: [1, "Volkswagen", 10.3, 12.0, 12.8, 13.0, 13.8] }
-            CustomModelElement { values: [2, "Toyota", 13.8, 13.5, 16.2, 13.7, 10.7] }
-            CustomModelElement { values: [3, "Ford", 6.4, 7.1, 8.9, 8.2, 8.6] }
-            CustomModelElement { values: [4, "Skoda", 4.7, 5.8, 6.9, 8.3, 8.2] }
-            CustomModelElement { values: [5, "Volvo", 7.1, 6.7, 6.5, 6.3, 7.0] }
-            CustomModelElement { values: [6, "Others", 57.7, 54.9, 48.7, 50.5, 51.7] }
-        }
-        //![2]
-
-        //![5]
-        BarSeries {
-            id: myBarSeries
-            name: "Others"
-            axisX: categoriesAxis
-            axisY: valueAxis
-            barWidth: 0.9
-            visible: false
-            HBarModelMapper {
-                model: customModel
-                firstBarSetRow: 6
-                lastBarSetRow: 6
-                firstColumn: 2
-            }
-        }
-        //![5]
-
-        //![4]
-        LineSeries {
-            id: lineSeries1
-            name: "Volkswagen"
-            axisX: categoriesAxis
-            axisY: valueAxis
-            visible: false
-            HXYModelMapper {
-                model: customModel
-                xRow: 0
-                yRow: 1
-                firstColumn: 2
-            }
-        }
-        //![4]
-
-        LineSeries {
-            id: lineSeries2
-            name: "Toyota"
-            axisX: categoriesAxis
-            axisY: valueAxis
-            visible: false
-            HXYModelMapper {
-                model: customModel
-                xRow: 0
-                yRow: 2
-                firstColumn: 2
-            }
-        }
-
-        LineSeries {
-            id: lineSeries3
-            name: "Ford"
-            axisX: categoriesAxis
-            axisY: valueAxis
-            visible: false
-            HXYModelMapper {
-                model: customModel
-                xRow: 0
-                yRow: 3
-                firstColumn: 2
-            }
-        }
-
-        LineSeries {
-            id: lineSeries4
-            name: "Skoda"
-            axisX: categoriesAxis
-            axisY: valueAxis
-            visible: false
-            HXYModelMapper {
-                model: customModel
-                xRow: 0
-                yRow: 4
-                firstColumn: 2
-            }
-        }
-
-        LineSeries {
-            id: lineSeries5
-            name: "Volvo"
-            axisX: categoriesAxis
-            axisY: valueAxis
-            visible: false
-            HXYModelMapper {
-                model: customModel
-                xRow: 0
-                yRow: 5
-                firstColumn: 2
-            }
-        }
-
-        //![3]
-        PieSeries {
-            id: pieSeries
-            size: 0.4
-            horizontalPosition: 0.85
-            verticalPosition: 0.4
-            onClicked: {
-                // Show the selection by exploding the slice
-                slice.exploded = !slice.exploded;
-
-                // Update the line series to show the yearly data for this slice
-                for (var i = 0; i < chartView.count; i++) {
-                    if (chartView.series(i).name == slice.label) {
-                        chartView.series(i).visible = slice.exploded;
-                    }
-                }
-            }
-
-        }
-        VPieModelMapper {
-            model: customModel
-            series: pieSeries
-            labelsColumn: 1
-            valuesColumn: 2
-            firstRow: 1
-        }
-        //![3]
-    }
-}
diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp
deleted file mode 100644
index cb22705..0000000
--- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.cpp
+++ /dev/null
@@ -1,177 +0,0 @@
-// checksum 0xaa72 version 0x90018
-/*
-  This file was generated by the Qt Quick Application wizard of Qt Creator.
-  QmlApplicationViewer is a convenience class containing mobile device specific
-  code such as screen orientation handling. Also QML paths and debugging are
-  handled here.
-  It is recommended not to modify this file, since newer versions of Qt Creator
-  may offer an updated version of it.
-*/
-
-#include "qmlapplicationviewer.h"
-
-#include <QDir>
-#include <QFileInfo>
-#include <QApplication>
-#include <QDeclarativeComponent>
-#include <QDeclarativeEngine>
-#include <QDeclarativeContext>
-
-#include <qplatformdefs.h> // MEEGO_EDITION_HARMATTAN
-
-#ifdef HARMATTAN_BOOSTER
-#include <MDeclarativeCache>
-#endif
-
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-
-#include <qt_private/qdeclarativedebughelper_p.h>
-
-#if !defined(NO_JSDEBUGGER)
-#include <jsdebuggeragent.h>
-#endif
-#if !defined(NO_QMLOBSERVER)
-#include <qdeclarativeviewobserver.h>
-#endif
-
-// Enable debugging before any QDeclarativeEngine is created
-struct QmlJsDebuggingEnabler
-{
-    QmlJsDebuggingEnabler()
-    {
-        QDeclarativeDebugHelper::enableDebugging();
-    }
-};
-
-// Execute code in constructor before first QDeclarativeEngine is instantiated
-static QmlJsDebuggingEnabler enableDebuggingHelper;
-
-#endif // QMLJSDEBUGGER
-
-class QmlApplicationViewerPrivate
-{
-    QString mainQmlFile;
-    friend class QmlApplicationViewer;
-    static QString adjustPath(const QString &path);
-};
-
-QString QmlApplicationViewerPrivate::adjustPath(const QString &path)
-{
-#ifdef Q_OS_MAC
-    if (!QDir::isAbsolutePath(path))
-        return QString::fromLatin1("%1/../Resources/%2")
-                .arg(QCoreApplication::applicationDirPath(), path);
-#elif defined(Q_OS_BLACKBERRY)
-    if (!QDir::isAbsolutePath(path))
-        return QString::fromLatin1("app/native/%1").arg(path);
-#elif !defined(Q_OS_ANDROID)
-    QString pathInInstallDir =
-            QString::fromLatin1("%1/../%2").arg(QCoreApplication::applicationDirPath(), path);
-    if (QFileInfo(pathInInstallDir).exists())
-        return pathInInstallDir;
-    pathInInstallDir =
-            QString::fromLatin1("%1/%2").arg(QCoreApplication::applicationDirPath(), path);
-    if (QFileInfo(pathInInstallDir).exists())
-        return pathInInstallDir;
-#endif
-    return path;
-}
-
-QmlApplicationViewer::QmlApplicationViewer(QWidget *parent)
-    : QDeclarativeView(parent)
-    , d(new QmlApplicationViewerPrivate())
-{
-    connect(engine(), SIGNAL(quit()), SLOT(close()));
-    setResizeMode(QDeclarativeView::SizeRootObjectToView);
-
-    // Qt versions prior to 4.8.0 don't have QML/JS debugging services built in
-#if defined(QMLJSDEBUGGER) && QT_VERSION < 0x040800
-#if !defined(NO_JSDEBUGGER)
-    new QmlJSDebugger::JSDebuggerAgent(engine());
-#endif
-#if !defined(NO_QMLOBSERVER)
-    new QmlJSDebugger::QDeclarativeViewObserver(this, this);
-#endif
-#endif
-}
-
-QmlApplicationViewer::~QmlApplicationViewer()
-{
-    delete d;
-}
-
-QmlApplicationViewer *QmlApplicationViewer::create()
-{
-    return new QmlApplicationViewer();
-}
-
-void QmlApplicationViewer::setMainQmlFile(const QString &file)
-{
-    d->mainQmlFile = QmlApplicationViewerPrivate::adjustPath(file);
-#ifdef Q_OS_ANDROID
-    setSource(QUrl(QLatin1String("assets:/")+d->mainQmlFile));
-#else
-    setSource(QUrl::fromLocalFile(d->mainQmlFile));
-#endif
-}
-
-void QmlApplicationViewer::addImportPath(const QString &path)
-{
-    engine()->addImportPath(QmlApplicationViewerPrivate::adjustPath(path));
-}
-
-void QmlApplicationViewer::setOrientation(ScreenOrientation orientation)
-{
-#if QT_VERSION < 0x050000
-    Qt::WidgetAttribute attribute;
-    switch (orientation) {
-#if QT_VERSION < 0x040702
-    // Qt < 4.7.2 does not yet have the Qt::WA_*Orientation attributes
-    case ScreenOrientationLockPortrait:
-        attribute = static_cast<Qt::WidgetAttribute>(128);
-        break;
-    case ScreenOrientationLockLandscape:
-        attribute = static_cast<Qt::WidgetAttribute>(129);
-        break;
-    default:
-    case ScreenOrientationAuto:
-        attribute = static_cast<Qt::WidgetAttribute>(130);
-        break;
-#else // QT_VERSION < 0x040702
-    case ScreenOrientationLockPortrait:
-        attribute = Qt::WA_LockPortraitOrientation;
-        break;
-    case ScreenOrientationLockLandscape:
-        attribute = Qt::WA_LockLandscapeOrientation;
-        break;
-    default:
-    case ScreenOrientationAuto:
-        attribute = Qt::WA_AutoOrientation;
-        break;
-#endif // QT_VERSION < 0x040702
-    };
-    setAttribute(attribute, true);
-#else // QT_VERSION < 0x050000
-    Q_UNUSED(orientation)
-#endif // QT_VERSION < 0x050000
-}
-
-void QmlApplicationViewer::showExpanded()
-{
-#if defined(MEEGO_EDITION_HARMATTAN) || defined(Q_WS_SIMULATOR)
-    showFullScreen();
-#elif defined(Q_WS_MAEMO_5) || defined(Q_OS_QNX)
-    showMaximized();
-#else
-    show();
-#endif
-}
-
-QApplication *createApplication(int &argc, char **argv)
-{
-#ifdef HARMATTAN_BOOSTER
-    return MDeclarativeCache::qApplication(argc, argv);
-#else
-    return new QApplication(argc, argv);
-#endif
-}
diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h
deleted file mode 100644
index adcb232..0000000
--- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.h
+++ /dev/null
@@ -1,46 +0,0 @@
-// checksum 0xc67a version 0x90018
-/*
-  This file was generated by the Qt Quick Application wizard of Qt Creator.
-  QmlApplicationViewer is a convenience class containing mobile device specific
-  code such as screen orientation handling. Also QML paths and debugging are
-  handled here.
-  It is recommended not to modify this file, since newer versions of Qt Creator
-  may offer an updated version of it.
-*/
-
-#ifndef QMLAPPLICATIONVIEWER_H
-#define QMLAPPLICATIONVIEWER_H
-
-#include <QDeclarativeView>
-
-class QmlApplicationViewer : public QDeclarativeView
-{
-    Q_OBJECT
-
-public:
-    enum ScreenOrientation {
-        ScreenOrientationLockPortrait,
-        ScreenOrientationLockLandscape,
-        ScreenOrientationAuto
-    };
-
-    explicit QmlApplicationViewer(QWidget *parent = 0);
-    virtual ~QmlApplicationViewer();
-
-    static QmlApplicationViewer *create();
-
-    void setMainQmlFile(const QString &file);
-    void addImportPath(const QString &path);
-
-    // Note that this will only have an effect on Fremantle.
-    void setOrientation(ScreenOrientation orientation);
-
-    void showExpanded();
-
-private:
-    class QmlApplicationViewerPrivate *d;
-};
-
-QApplication *createApplication(int &argc, char **argv);
-
-#endif // QMLAPPLICATIONVIEWER_H
diff --git a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri b/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri
deleted file mode 100644
index 567c6dc..0000000
--- a/demos/qmlcustommodel/qmlapplicationviewer/qmlapplicationviewer.pri
+++ /dev/null
@@ -1,13 +0,0 @@
-QT += declarative
-
-SOURCES += $$PWD/qmlapplicationviewer.cpp
-HEADERS += $$PWD/qmlapplicationviewer.h
-INCLUDEPATH += $$PWD
-
-# Include JS debugger library if QMLJSDEBUGGER_PATH is set
-!isEmpty(QMLJSDEBUGGER_PATH) {
-    include($$QMLJSDEBUGGER_PATH/qmljsdebugger-lib.pri)
-} else {
-    DEFINES -= QMLJSDEBUGGER
-}
-
diff --git a/demos/qmlcustommodel/qmlchart.svg b/demos/qmlcustommodel/qmlchart.svg
deleted file mode 100644
index 566acfa..0000000
--- a/demos/qmlcustommodel/qmlchart.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="44px"
-   version="1.1"
-   viewBox="0 0 44 44"
-   width="44px"
-   x="0px"
-   y="0px"
-   id="svg2"
-   inkscape:version="0.47 r22583"
-   sodipodi:docname="qt.svg">
-  <metadata
-     id="metadata18">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs16">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 22 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="44 : 22 : 1"
-       inkscape:persp3d-origin="22 : 14.666667 : 1"
-       id="perspective2836" />
-  </defs>
-  <sodipodi:namedview
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1"
-     objecttolerance="10"
-     gridtolerance="10"
-     guidetolerance="10"
-     inkscape:pageopacity="0"
-     inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1020"
-     id="namedview14"
-     showgrid="false"
-     inkscape:zoom="21.454545"
-     inkscape:cx="49.412871"
-     inkscape:cy="21.894358"
-     inkscape:window-x="-4"
-     inkscape:window-y="-4"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="g3" />
-  <g
-     transform="matrix(0.18308778,0,0,0.18308778,6.6100946,3.2385199)"
-     id="g3">
-    <path
-       d="M 43.09,0.3586 C 40.94,0.0036 38.84,-0.0824 36.81,0.0776 31.968136,0.39505671 27.122677,0.73638425 22.28,1.0696 9.62,2.0816 0,12.4996 0,26.8896 l 0,169.7 14.19,13.2 28.87,-209.42 0.03,-0.011 z"
-       style="fill:#006225"
-       id="path5"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       d="m 174.4,160 c 0,12.5 -7.75,24.07 -17.57,25.77 L 14.23,209.73 V 25.93 C 14.23,9.21 27.57,-2.27 43.12,0.3 l 131.3,21.52 v 138.2 z"
-       style="fill:#80c342"
-       id="path7" />
-    <path
-       d="m 154.9,80.96 -12.96,-0.598 0,0.278 6.945,0.32 6.016,0 z"
-       style="fill:#006225"
-       id="path11" />
-    <path
-       d="m 144.6,135.6 c 0.66,0.328 1.43,0.476 2.351,0.476 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 h -6.015 c -1.821,0.832 -3.532,1.457 -5.176,1.848 z"
-       style="fill:#006225"
-       id="path13" />
-    <path
-       id="path17"
-       style="fill:#ffffff"
-       d="m 91.15,132.4 c 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -4.34,0 -7.68,2.535 -10.01,7.625 -2.52,5.543 -3.793,17.04 -3.793,34.44 0,16.82 1.238,28.75 3.734,35.75 2.356,6.672 5.879,9.976 10.5,9.976 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 m 17.98,3.75 c -4.117,9.707 -10.39,16.06 -18.99,19 0.867,4.449 2.176,7.441 3.922,9.019 1.351,1.211 3.433,1.821 6.222,1.821 0.805,0 1.668,-0.055 2.59,-0.157 v 13.12 l -5.961,0.782 c -1.758,0.23 -3.426,0.343 -5.004,0.343 -5.218,0 -9.445,-1.265 -12.62,-3.824 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 1.629,0 3.309,0.102 5.043,0.305 11.95,1.375 20.62,7.016 26.26,16.79 5.535,9.562 8.254,23.27 8.254,41.26 0,16.48 -2,29.45 -6.043,39.02 z M 130.4,45.91 l 11.52,1.238 0,20.21 12.96,0.914 0,12.68 -12.96,-0.598 0,46.33 c 0,4.032 0.445,6.625 1.34,7.789 0.8,1.067 2.046,1.594 3.71,1.594 0.161,0 0.329,-0.004 0.497,-0.016 2.55,-0.148 5.32,-0.933 8.343,-2.308 v 11.65 c -5.136,2.258 -10.18,3.598 -15.12,4.02 -0.718,0.055 -1.41,0.086 -2.078,0.086 -4.48,0 -7.906,-1.301 -10.25,-3.934 -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.535 L 118.046,79.25 V 65.66 l 7.586,0.547 4.773,-20.3 z" />
-    <path
-       d="m 100.3,166 c 0.809,0 1.672,-0.055 2.59,-0.157 H 98.054 C 98.73,165.949 99.507,166 100.3,166 z"
-       style="fill:#006225"
-       id="path19" />
-    <path
-       id="path21"
-       style="fill:#006225"
-       d="m 84.85,63.98 c 2.336,5.997 3.484,16.92 3.484,32.81 0,17.7 -1.16,29.57 -3.512,35.62 -1.894,4.879 -4.527,7.902 -7.863,9.07 0.965,0.368 1.992,0.551 3.078,0.551 0.207,0 0.41,-0.008 0.621,-0.019 4.633,-0.293 8.121,-3.496 10.49,-9.602 2.351,-6.051 3.511,-17.91 3.511,-35.62 0,-15.89 -1.148,-26.82 -3.484,-32.81 -2.336,-6.027 -5.832,-9.281 -10.52,-9.691 -0.359,-0.031 -0.714,-0.051 -1.058,-0.051 -1.09,0 -2.117,0.16 -3.082,0.481 h -0.004 c 3.601,1.121 6.379,4.215 8.336,9.261 z m -2.344,114.3 c -0.113,-0.05 -0.227,-0.105 -0.336,-0.16 -0.012,-0.004 -0.023,-0.012 -0.035,-0.015 -0.102,-0.051 -0.207,-0.106 -0.309,-0.157 -0.019,-0.011 -0.039,-0.019 -0.058,-0.031 -0.09,-0.051 -0.184,-0.098 -0.278,-0.148 -0.027,-0.016 -0.054,-0.036 -0.086,-0.051 -0.082,-0.043 -0.164,-0.09 -0.242,-0.137 -0.039,-0.023 -0.078,-0.047 -0.113,-0.07 -0.07,-0.039 -0.145,-0.082 -0.215,-0.125 -0.047,-0.031 -0.094,-0.059 -0.14,-0.09 -0.059,-0.039 -0.118,-0.074 -0.176,-0.113 -0.059,-0.039 -0.114,-0.075 -0.168,-0.114 -0.051,-0.031 -0.102,-0.066 -0.149,-0.097 -0.066,-0.047 -0.132,-0.094 -0.195,-0.137 -0.039,-0.027 -0.078,-0.055 -0.113,-0.082 -0.078,-0.055 -0.153,-0.113 -0.231,-0.172 -0.023,-0.016 -0.05,-0.035 -0.078,-0.055 -0.098,-0.078 -0.199,-0.156 -0.297,-0.234 -4.207,-3.379 -7.308,-9.894 -9.297,-19.54 -9.136,-1.945 -16.26,-7.754 -21.19,-17.5 -5.004,-9.902 -7.551,-24.39 -7.551,-43.34 0,-20.43 3.484,-35.51 10.34,-45.07 5.789,-8.07 13.86,-12.04 24.02,-12.04 h -6.351 c -10.15,0.008 -18.22,3.977 -24,12.04 -6.855,9.563 -10.34,24.64 -10.34,45.07 0,18.95 2.547,33.44 7.551,43.34 4.934,9.75 12.05,15.56 21.19,17.5 1.989,9.641 5.09,16.16 9.297,19.54 3.176,2.559 7.403,3.824 12.62,3.824 0.098,0 0.199,0 0.297,-0.004 h 5.539 c -3.406,-0.05 -6.383,-0.66 -8.906,-1.828 L 82.498,178.28 z M 128.4,145.6 c -2.73,-3.051 -4.09,-7.949 -4.09,-14.67 V 79.57 l -6.226,-0.285 v -13.59 h -6.016 v 3.035 c 0.871,3.273 1.555,6.82 2.063,10.64 l 4.164,0.192 v 51.36 c 0,6.723 1.367,11.62 4.09,14.67 2.343,2.633 5.765,3.934 10.25,3.934 h 6.015 c -4.48,0 -7.906,-1.301 -10.25,-3.934 z m 2.043,-99.66 -6.016,0 -4.668,19.88 5.911,0.422 4.773,-20.3 z" />
-  </g>
-</svg>
diff --git a/demos/qmlcustommodel/qmlcustommodel.pro b/demos/qmlcustommodel/qmlcustommodel.pro
deleted file mode 100644
index 0bfe97a..0000000
--- a/demos/qmlcustommodel/qmlcustommodel.pro
+++ /dev/null
@@ -1,13 +0,0 @@
-!include( ../demos.pri ) {
-    error( "Couldn't find the demos.pri file!" )
-}
-
-RESOURCES += resources.qrc
-SOURCES += main.cpp\
-           customtablemodel.cpp \
-           declarativemodel.cpp
-HEADERS += customtablemodel.h \
-           declarativemodel.h
-OTHER_FILES += qml/qmlcustommodel/*
-
-include(qmlapplicationviewer/qmlapplicationviewer.pri)
diff --git a/demos/qmlcustommodel/resources.qrc b/demos/qmlcustommodel/resources.qrc
deleted file mode 100644
index 7effbf4..0000000
--- a/demos/qmlcustommodel/resources.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>qml/qmlcustommodel/loader.qml</file>
-        <file>qml/qmlcustommodel/main.qml</file>
-    </qresource>
-</RCC>
diff --git a/doc/src/demos-qmlcustommodel.qdoc b/doc/src/demos-qmlcustommodel.qdoc
deleted file mode 100644
index 2ba671c..0000000
--- a/doc/src/demos-qmlcustommodel.qdoc
+++ /dev/null
@@ -1,29 +0,0 @@
-/*!
-    \example demos/qmlcustommodel
-    \title QML Custom Model
-    \subtitle
-
-    This example shows how to use your own QAbstractItemModel derived data model as a data source for a ChartView.
-    \image demos_qmlcustommodel.png
-
-    First we create a ChartView:
-    \snippet ../demos/qmlcustommodel/qml/qmlcustommodel/main.qml 1
-
-    Then our data model that contains the shares of the top 5 car manufacturers in Finland for the last 5 years. The model
-    could be constructed from various sources depending on the use case, but here we use static data for the sake of
-    simplicity. Check customtablemodel.cpp, declarativemodel.cpp, and plugin.cpp to see how to make your own
-    QAbstractItemModel accessible on QML.
-    \snippet ../demos/qmlcustommodel/qml/qmlcustommodel/main.qml 2
-
-    Then we create several series as children for the same ChartView. First a pie series that illustrates the shares of
-    the car manufacturers in Finland in 2011:
-    \snippet ../demos/qmlcustommodel/qml/qmlcustommodel/main.qml 3
-
-    And one line series for each manufacturer presenting the share between 2007-2011, for example for Volkswagen.
-    The series is not visible by default. It is made visible when the user clicks on the Volkswagen slice
-    on the pie series:
-    \snippet ../demos/qmlcustommodel/qml/qmlcustommodel/main.qml 4
-
-    And finally a bar series that shows the share for all the other manufacturers between 2007-2011:
-    \snippet ../demos/qmlcustommodel/qml/qmlcustommodel/main.qml 5
-*/
diff --git a/doc/src/demos.qdoc b/doc/src/demos.qdoc
index 453f4c9..38c310f 100644
--- a/doc/src/demos.qdoc
+++ b/doc/src/demos.qdoc
@@ -41,11 +41,11 @@
         </tr>
         <tr>
             <td><a href="demos-qmlcustomizations.html">Qml Customizations</a></td>
-            <td><a href="demos-qmlcustommodel.html">Qml Custom Model</a></td>
+            <td><a href="demos-qmlcustomlegend.html">Qml Custom Legend</a></td>
         </tr>
         <tr>
             <td><a href="demos-qmlcustomizations.html"><img src="images/demos_qmlcustomizations.png" width="300" alt="Qml Customizations" /></a></td>
-            <td><a href="demos-qmlcustommodel.html"><img src="images/demos_qmlcustommodel.png" width="300" alt="Qml Custom Model" /></a></td>
+            <td><a href="demos-qmlcustomlegend.html"><img src="images/demos-qmlcustomlegend1.png" width="300" alt="Qml Custom Legend" /></a></td>
         </tr>
         <tr>
             <td><a href="demos-qmlf1legends.html">Qml F1 Legends</a></td>
@@ -57,24 +57,18 @@
         </tr>
         <tr>
             <td><a href="demos-qmlweather.html">Qml Weather</a></td>
-            <td><a href="demos-qmlcustomlegend.html">Qml Custom Legend</a></td>
-        </tr>
-        <tr>
-            <td><a href="demos-qmlweather.html"><img src="images/demos_qmlweather.png" width="300" alt="Qml Weather" /></a></td>
-            <td><a href="demos-qmlcustomlegend.html"><img src="images/demos-qmlcustomlegend1.png" width="300" alt="Qml Custom Legend" /></a></td>
-        </tr>
-        <tr>
             <td><a href="demos-qmlpolarchart.html">Qml Polar Chart</a></td>
-            <td><a href="demos-quick2chart.html">Qt Quick 2 Basic Charts</a></td>
         </tr>
         <tr>
+            <td><a href="demos-qmlweather.html"><img src="images/demos_qmlweather.png" width="300" alt="Qml Weather" /></a></td>
             <td><a href="demos-qmlpolarchart.html"><img src="images/demos_qmlpolarchart1.png" width="300" alt="Qml Polar Chart" /></a></td>
-            <td><a href="demos-quick2chart.html"><img src="images/demos_qmlchart1.png" width="300" alt="Qt Quick 2 Basic Charts" /></a></td>
         </tr>
         <tr>
+            <td><a href="demos-quick2chart.html">Qt Quick 2 Basic Charts</a></td>
             <td><a href="demos-quick2oscilloscope.html">Qt Quick 2 Oscilloscope</a></td>
         </tr>
         <tr>
+            <td><a href="demos-quick2chart.html"><img src="images/demos_qmlchart1.png" width="300" alt="Qt Quick 2 Basic Charts" /></a></td>
             <td><a href="demos-quick2oscilloscope.html"><img src="images/demos_qmloscilloscope.png" width="300" alt="Qt Quick 2 Oscilloscope" /></a></td>
         </tr>
     </table>
diff --git a/src/barchart/qhbarmodelmapper.cpp b/src/barchart/qhbarmodelmapper.cpp
index c5d4c09..ccc8d19 100644
--- a/src/barchart/qhbarmodelmapper.cpp
+++ b/src/barchart/qhbarmodelmapper.cpp
@@ -74,9 +74,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 /*!
     \qmlproperty SomeModel HBarModelMapper::model
-    The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
-    QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
-    and modifying the data of the cells.
+    The QAbstractItemModel based model that is used by the mapper. You need to implement the model
+    and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
+    the data of the cells.
 */
 
 /*!
diff --git a/src/barchart/qvbarmodelmapper.cpp b/src/barchart/qvbarmodelmapper.cpp
index 19eea3b..4cd98ea 100644
--- a/src/barchart/qvbarmodelmapper.cpp
+++ b/src/barchart/qvbarmodelmapper.cpp
@@ -75,9 +75,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 /*!
     \qmlproperty SomeModel VBarModelMapper::model
-    The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
-    QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
-    and modifying the data of the cells.
+    The QAbstractItemModel based model that is used by the mapper. You need to implement the model
+    and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
+    the data of the cells.
 */
 
 /*!
diff --git a/src/piechart/qhpiemodelmapper.cpp b/src/piechart/qhpiemodelmapper.cpp
index ea0f435..9cdb2cf 100644
--- a/src/piechart/qhpiemodelmapper.cpp
+++ b/src/piechart/qhpiemodelmapper.cpp
@@ -72,9 +72,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 /*!
     \qmlproperty SomeModel HPieModelMapper::model
-    The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
-    QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
-    and modifying the data of the cells.
+    The QAbstractItemModel based model that is used by the mapper. You need to implement the model
+    and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
+    the data of the cells.
 */
 
 /*!
diff --git a/src/piechart/qvpiemodelmapper.cpp b/src/piechart/qvpiemodelmapper.cpp
index 96a55be..38eecd1 100644
--- a/src/piechart/qvpiemodelmapper.cpp
+++ b/src/piechart/qvpiemodelmapper.cpp
@@ -71,9 +71,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 /*!
     \qmlproperty SomeModel VPieModelMapper::model
-    The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
-    QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
-    and modifying the data of the cells.
+    The QAbstractItemModel based model that is used by the mapper. You need to implement the model
+    and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
+    the data of the cells.
 */
 
 /*!
diff --git a/src/xychart/qhxymodelmapper.cpp b/src/xychart/qhxymodelmapper.cpp
index 60bf3a3..30201e7 100644
--- a/src/xychart/qhxymodelmapper.cpp
+++ b/src/xychart/qhxymodelmapper.cpp
@@ -58,9 +58,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 /*!
     \qmlproperty SomeModel HXYModelMapper::model
-    The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
-    QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
-    and modifying the data of the cells.
+    The QAbstractItemModel based model that is used by the mapper. You need to implement the model
+    and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
+    the data of the cells.
 */
 
 /*!
diff --git a/src/xychart/qvxymodelmapper.cpp b/src/xychart/qvxymodelmapper.cpp
index 91d055f..af5149e 100644
--- a/src/xychart/qvxymodelmapper.cpp
+++ b/src/xychart/qvxymodelmapper.cpp
@@ -58,9 +58,9 @@ QTCOMMERCIALCHART_BEGIN_NAMESPACE
 */
 /*!
     \qmlproperty SomeModel VXYModelMapper::model
-    The QAbstractItemModel based model that is used by the mapper. You need to implement the model and expose it to
-    QML as shown in \l {QML Custom Model} demo application. Note: the model has to support adding/removing rows/columns
-    and modifying the data of the cells.
+    The QAbstractItemModel based model that is used by the mapper. You need to implement the model
+    and expose it to QML. Note: the model has to support adding/removing rows/columns and modifying
+    the data of the cells.
 */
 
 /*!