Merge branch 'kinetic-declarativeui' of git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui

18 files changed, 265 insertions, 25 deletions

diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp
index 1ea6575..27caf20 100644
--- a/src/declarative/util/qmlanimation.cpp
+++ b/src/declarative/util/qmlanimation.cpp
@@ -639,7 +639,7 @@ void QmlAbstractAnimation::timelineComplete()
     \l{xmlPauseAnimation} {<PauseAnimation>}.
 */
 
-QML_DEFINE_TYPE(QmlPauseAnimation,PauseAnimation)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,PauseAnimation,QmlPauseAnimation)
 QmlPauseAnimation::QmlPauseAnimation(QObject *parent)
 : QmlAbstractAnimation(*(new QmlPauseAnimationPrivate), parent)
 {
@@ -771,7 +771,7 @@ void QmlColorAnimation::setTo(const QColor &t)
     QmlPropertyAnimation::setTo(t);
 }
 
-QML_DEFINE_TYPE(QmlColorAnimation,ColorAnimation)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ColorAnimation,QmlColorAnimation)
 
 /*!
     \qmlclass RunScriptAction QmlRunScriptAction
@@ -865,7 +865,7 @@ QAbstractAnimation *QmlRunScriptAction::qtAnimation()
     return d->rsa;
 }
 
-QML_DEFINE_TYPE(QmlRunScriptAction, RunScriptAction)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,RunScriptAction,QmlRunScriptAction)
 
 /*!
     \qmlclass SetPropertyAction QmlSetPropertyAction
@@ -1073,7 +1073,7 @@ void QmlSetPropertyAction::transition(QmlStateActions &actions,
     }
 }
 
-QML_DEFINE_TYPE(QmlSetPropertyAction,SetPropertyAction)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,SetPropertyAction,QmlSetPropertyAction)
 
 /*!
     \qmlclass ParentChangeAction QmlParentChangeAction
@@ -1170,7 +1170,7 @@ void QmlParentChangeAction::transition(QmlStateActions &actions,
     }
 }
 
-QML_DEFINE_TYPE(QmlParentChangeAction,ParentChangeAction)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ParentChangeAction,QmlParentChangeAction)
 
 /*!
     \qmlclass NumberAnimation QmlNumberAnimation
@@ -1248,7 +1248,7 @@ void QmlNumberAnimation::setTo(qreal t)
     QmlPropertyAnimation::setTo(t);
 }
 
-QML_DEFINE_TYPE(QmlNumberAnimation,NumberAnimation)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,NumberAnimation,QmlNumberAnimation)
 
 QmlAnimationGroup::QmlAnimationGroup(QObject *parent)
 : QmlAbstractAnimation(*(new QmlAnimationGroupPrivate), parent)
@@ -1338,7 +1338,7 @@ void QmlSequentialAnimation::transition(QmlStateActions &actions,
     }
 }
 
-QML_DEFINE_TYPE(QmlSequentialAnimation,SequentialAnimation)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,SequentialAnimation,QmlSequentialAnimation)
 
 /*!
     \qmlclass ParallelAnimation QmlParallelAnimation
@@ -1420,7 +1420,7 @@ void QmlParallelAnimation::transition(QmlStateActions &actions,
     }
 }
 
-QML_DEFINE_TYPE(QmlParallelAnimation,ParallelAnimation)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ParallelAnimation,QmlParallelAnimation)
 
 //convert a variant from string type to another animatable type
 void QmlPropertyAnimationPrivate::convertVariant(QVariant &variant, int type)
@@ -1883,6 +1883,6 @@ void QmlPropertyAnimation::transition(QmlStateActions &actions,
     }
 }
 
-QML_DEFINE_TYPE(QmlPropertyAnimation,PropertyAnimation)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,PropertyAnimation,QmlPropertyAnimation)
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp
index 7493b12..2ba8802 100644
--- a/src/declarative/util/qmlbind.cpp
+++ b/src/declarative/util/qmlbind.cpp
@@ -63,7 +63,7 @@ public:
     QmlNullableValue<QVariant> value;
 };
 
-QML_DEFINE_TYPE(QmlBind,Bind)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Bind,QmlBind)
 /*!
     \qmlclass Bind QmlBind
     \brief The Bind element allows arbitrary property bindings to be created.
diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp
index 95f4573..d506782 100644
--- a/src/declarative/util/qmlconnection.cpp
+++ b/src/declarative/util/qmlconnection.cpp
@@ -294,6 +294,6 @@ void QmlConnection::setSignal(const QString& sig)
     connectIfValid();
 }
 
-QML_DEFINE_TYPE(QmlConnection,Connection)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Connection,QmlConnection)
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlfollow.cpp b/src/declarative/util/qmlfollow.cpp
index 63b6307..d8b520f 100644
--- a/src/declarative/util/qmlfollow.cpp
+++ b/src/declarative/util/qmlfollow.cpp
@@ -48,7 +48,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(QmlFollow,Follow)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Follow,QmlFollow)
 
 class QmlFollowPrivate : public QObjectPrivate
 {
diff --git a/src/declarative/util/qmlfont.cpp b/src/declarative/util/qmlfont.cpp
index 3075b82..06e8769 100644
--- a/src/declarative/util/qmlfont.cpp
+++ b/src/declarative/util/qmlfont.cpp
@@ -51,7 +51,7 @@ public:
     QFont font;
 };
 
-QML_DEFINE_TYPE(QmlFont,Font)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Font,QmlFont)
 
 /*!
     \internal
diff --git a/src/declarative/util/qmlfontfamily.cpp b/src/declarative/util/qmlfontfamily.cpp
new file mode 100644
index 0000000..407d2ab
--- /dev/null
+++ b/src/declarative/util/qmlfontfamily.cpp
@@ -0,0 +1,152 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#include "private/qobject_p.h"
+#include "qmlfontfamily.h"
+#include <QUrl>
+#include <QDebug>
+#include <QNetworkRequest>
+#include <QNetworkReply>
+#include <QFile>
+#include <QmlContext>
+#include <QtDeclarative/qmlengine.h>
+#include <QFontDatabase>
+
+QT_BEGIN_NAMESPACE
+
+class QmlFontFamilyPrivate : public QObjectPrivate
+{
+    Q_DECLARE_PUBLIC(QmlFontFamily);
+
+public:
+    QmlFontFamilyPrivate() : reply(0) {}
+
+    void addFontToDatabase(const QByteArray &);
+
+    QUrl url;
+    QString name;
+    QNetworkReply *reply;
+};
+
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,FontFamily,QmlFontFamily)
+
+/*!
+    \qmlclass FontFamily QmlFontFamily
+    \ingroup group_utility
+*/
+QmlFontFamily::QmlFontFamily(QObject *parent)
+    : QObject(*(new QmlFontFamilyPrivate), parent)
+{
+}
+
+QmlFontFamily::~QmlFontFamily()
+{
+}
+
+QUrl QmlFontFamily::source() const
+{
+    Q_D(const QmlFontFamily);
+    return d->url;
+}
+
+void QmlFontFamily::setSource(const QUrl &url)
+{
+    Q_D(QmlFontFamily);
+    if (url == d->url)
+        return;
+    d->url = qmlContext(this)->resolvedUrl(url);
+
+#ifndef QT_NO_LOCALFILE_OPTIMIZED_QML
+    if (d->url.scheme() == QLatin1String("file")) {
+        QFile file(d->url.toLocalFile());
+        file.open(QIODevice::ReadOnly);
+        QByteArray ba = file.readAll();
+        d->addFontToDatabase(ba);
+    } else
+#endif
+    {
+        QNetworkRequest req(d->url);
+        req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
+        d->reply = qmlEngine(this)->networkAccessManager()->get(req);
+        QObject::connect(d->reply, SIGNAL(finished()), this, SLOT(replyFinished()));
+    }
+}
+
+QString QmlFontFamily::name() const
+{
+    Q_D(const QmlFontFamily);
+    return d->name;
+}
+
+void QmlFontFamily::setName(const QString &name)
+{
+    Q_D(QmlFontFamily);
+    if (d->name == name )
+        return;
+    d->name = name;
+    emit nameChanged();
+}
+
+void QmlFontFamily::replyFinished()
+{
+    Q_D(QmlFontFamily);
+    if (!d->reply->error()) {
+        QByteArray ba = d->reply->readAll();
+        d->addFontToDatabase(ba);
+    }
+    d->reply->deleteLater();
+    d->reply = 0;
+}
+
+void QmlFontFamilyPrivate::addFontToDatabase(const QByteArray &ba)
+{
+    Q_Q(QmlFontFamily);
+
+    int id = QFontDatabase::addApplicationFontFromData(ba);
+    if (id != -1) {
+        name = QFontDatabase::applicationFontFamilies(id).at(0);
+        emit q->nameChanged();
+    } else {
+        qWarning() << "Cannot load font: " << name << url;
+    }
+}
+
+QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlfontfamily.h b/src/declarative/util/qmlfontfamily.h
new file mode 100644
index 0000000..739a553
--- /dev/null
+++ b/src/declarative/util/qmlfontfamily.h
@@ -0,0 +1,86 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Contact: Qt Software Information (qt-info@nokia.com)
+**
+** This file is part of the QtDeclarative module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the either Technology Preview License Agreement or the
+** Beta Release License Agreement.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain
+** additional rights. These rights are described in the Nokia Qt LGPL
+** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
+** package.
+**
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 3.0 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU General Public License version 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+** If you are unsure which license is appropriate for your use, please
+** contact the sales department at qt-sales@nokia.com.
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef QMLFONTFAMILY_H
+#define QMLFONTFAMILY_H
+
+#include <QtCore/qobject.h>
+#include <QtDeclarative/qml.h>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+QT_MODULE(Declarative)
+
+class QmlFontFamilyPrivate;
+class Q_DECLARATIVE_EXPORT QmlFontFamily : public QObject
+{
+    Q_OBJECT
+    Q_DECLARE_PRIVATE(QmlFontFamily)
+
+    Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
+    Q_PROPERTY(QString name READ name WRITE setName NOTIFY nameChanged)
+
+public:
+    QmlFontFamily(QObject *parent = 0);
+    ~QmlFontFamily();
+
+    QUrl source() const;
+    void setSource(const QUrl &url);
+
+    QString name() const;
+    void setName(const QString &name);
+
+private Q_SLOTS:
+    void replyFinished();
+
+Q_SIGNALS:
+    void nameChanged();
+};
+
+QT_END_NAMESPACE
+
+QML_DECLARE_TYPE(QmlFontFamily)
+
+QT_END_HEADER
+
+#endif // QMLFONTFAMILY_H
diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp
index 0c167c0..718040e 100644
--- a/src/declarative/util/qmllistmodel.cpp
+++ b/src/declarative/util/qmllistmodel.cpp
@@ -500,14 +500,14 @@ void QmlListModelParser::setCustomData(QObject *obj, const QByteArray &d)
     }
 }
 
-QML_DEFINE_CUSTOM_TYPE(QmlListModel, ListModel, QmlListModelParser)
+QML_DEFINE_CUSTOM_TYPE(Qt, 4,6, (QT_VERSION&0x00ff00)>>8, ListModel, QmlListModel, QmlListModelParser)
 
 // ### FIXME
 class QmlListElement : public QObject
 {
 Q_OBJECT
 };
-QML_DEFINE_TYPE(QmlListElement,ListElement)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ListElement,QmlListElement)
 
 static void dump(ModelNode *node, int ind)
 {
diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp
index eec769e..8483080 100644
--- a/src/declarative/util/qmlpackage.cpp
+++ b/src/declarative/util/qmlpackage.cpp
@@ -147,7 +147,7 @@ QmlPackageAttached *QmlPackage::qmlAttachedProperties(QObject *o)
     return new QmlPackageAttached(o);
 }
 
-QML_DEFINE_TYPE(QmlPackage, Package)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Package,QmlPackage)
 
 QT_END_NAMESPACE
 
diff --git a/src/declarative/util/qmlpalette.cpp b/src/declarative/util/qmlpalette.cpp
index 40cfa71..01b5ad3 100644
--- a/src/declarative/util/qmlpalette.cpp
+++ b/src/declarative/util/qmlpalette.cpp
@@ -52,7 +52,7 @@ public:
     QPalette::ColorGroup group;
 };
 
-QML_DEFINE_TYPE(QmlPalette,Palette)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Palette,QmlPalette)
 
 /*!
     \internal
diff --git a/src/declarative/util/qmlscript.cpp b/src/declarative/util/qmlscript.cpp
index 7199341..cfe5a1e 100644
--- a/src/declarative/util/qmlscript.cpp
+++ b/src/declarative/util/qmlscript.cpp
@@ -99,7 +99,7 @@ public:
     avoided.
 */
 
-QML_DEFINE_TYPE(QmlScript,Script)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Script,QmlScript)
 QmlScript::QmlScript(QObject *parent) : QObject(*(new QmlScriptPrivate), parent)
 {
 }
diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp
index ffd1e6a..bbbc6a9 100644
--- a/src/declarative/util/qmlsetproperties.cpp
+++ b/src/declarative/util/qmlsetproperties.cpp
@@ -357,6 +357,6 @@ void QmlSetProperties::setIsExplicit(bool e)
     d->isExplicit = e;
 }
 
-QML_DEFINE_CUSTOM_TYPE(QmlSetProperties,SetProperties,QmlSetPropertiesParser)
+QML_DEFINE_CUSTOM_TYPE(Qt, 4,6, (QT_VERSION&0x00ff00)>>8, SetProperties, QmlSetProperties, QmlSetPropertiesParser)
 
 QT_END_NAMESPACE
diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp
index 70b0137..c41c31a 100644
--- a/src/declarative/util/qmlstate.cpp
+++ b/src/declarative/util/qmlstate.cpp
@@ -144,7 +144,7 @@ QmlStateOperation::QmlStateOperation(QObjectPrivate &dd, QObject *parent)
     \sa {states-transitions}{States and Transitions}
 */
 
-QML_DEFINE_TYPE(QmlState,State)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,State,QmlState)
 QmlState::QmlState(QObject *parent)
 : QObject(*(new QmlStatePrivate), parent)
 {
diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp
index 946569c..13a0023 100644
--- a/src/declarative/util/qmlstategroup.cpp
+++ b/src/declarative/util/qmlstategroup.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 DEFINE_BOOL_CONFIG_OPTION(stateChangeDebug, STATECHANGE_DEBUG);
 
-QML_DEFINE_TYPE(QmlStateGroup,StateGroup)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,StateGroup,QmlStateGroup)
 
 class QmlStateGroupPrivate : public QObjectPrivate
 {
diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp
index c341cd6..fe9e410 100644
--- a/src/declarative/util/qmlstateoperations.cpp
+++ b/src/declarative/util/qmlstateoperations.cpp
@@ -122,7 +122,7 @@ void QmlParentChangePrivate::doChange(QFxItem *targetParent)
     \brief The ParentChange element allows you to reparent an object in a state.
 */
 
-QML_DEFINE_TYPE(QmlParentChange,ParentChange)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,ParentChange,QmlParentChange)
 QmlParentChange::QmlParentChange(QObject *parent)
     : QmlStateOperation(*(new QmlParentChangePrivate), parent)
 {
@@ -215,7 +215,7 @@ public:
     \qmlclass RunScript QmlRunScript
     \brief The RunScript element allows you to run a script in a state.
 */
-QML_DEFINE_TYPE(QmlRunScript,RunScript)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,RunScript,QmlRunScript)
 QmlRunScript::QmlRunScript(QObject *parent)
 : QmlStateOperation(*(new QmlRunScriptPrivate), parent)
 {
diff --git a/src/declarative/util/qmltimer.cpp b/src/declarative/util/qmltimer.cpp
index 4af83d3..456b2ef 100644
--- a/src/declarative/util/qmltimer.cpp
+++ b/src/declarative/util/qmltimer.cpp
@@ -47,7 +47,7 @@
 
 QT_BEGIN_NAMESPACE
 
-QML_DEFINE_TYPE(QmlTimer,Timer)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Timer,QmlTimer)
 
 class QmlTimerPrivate : public QObjectPrivate
 {
diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp
index dffa6b5..eb8bf53 100644
--- a/src/declarative/util/qmltransition.cpp
+++ b/src/declarative/util/qmltransition.cpp
@@ -135,7 +135,7 @@ void ParallelAnimationWrapper::updateState(QAbstractAnimation::State oldState, Q
 }
 
 
-QML_DEFINE_TYPE(QmlTransition,Transition)
+QML_DEFINE_TYPE(Qt,4,6,(QT_VERSION&0x00ff00)>>8,Transition,QmlTransition)
 QmlTransition::QmlTransition(QObject *parent)
     : QObject(*(new QmlTransitionPrivate), parent)
 {
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index 59e3695..dfb79ac 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -7,6 +7,7 @@ SOURCES += \
            util/qmlscript.cpp \
            util/qmlanimation.cpp \
            util/qmlfont.cpp \
+           util/qmlfontfamily.cpp \
            util/qmlpalette.cpp \
            util/qmlfollow.cpp \
            util/qmlstate.cpp\
@@ -33,6 +34,7 @@ HEADERS += \
            util/qmlanimation.h \
            util/qmlanimation_p.h \
            util/qmlfont.h \
+           util/qmlfontfamily.h \
            util/qmlpalette.h \
            util/qmlfollow.h \
            util/qmlstate.h\