Move no-Gui related QML types from QtQuick into QtQml

Task-number: QTBUG-26340

Change-Id: I9049128db2598bf3c7a9d677b774eaae53b54eb5
Reviewed-by: Alan Alpert <aalpert@rim.com>
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>

10 files changed, 138 insertions, 136 deletions

diff --git a/src/qml/qml/qml.pri b/src/qml/qml/qml.pri
index e7286c25fb..20b46f0939 100644
--- a/src/qml/qml/qml.pri
+++ b/src/qml/qml/qml.pri
@@ -52,7 +52,10 @@ SOURCES += \
     $$PWD/qqmlglobal.cpp \
     $$PWD/qqmlfile.cpp \
     $$PWD/qqmlbundle.cpp \
-    $$PWD/qqmlmemoryprofiler.cpp
+    $$PWD/qqmlmemoryprofiler.cpp \
+    $$PWD/qqmlconnections.cpp \
+    $$PWD/qqmltimer.cpp \
+    $$PWD/qqmlbind.cpp
 
 HEADERS += \
     $$PWD/qqmlglobal_p.h \
@@ -125,7 +128,11 @@ HEADERS += \
     $$PWD/qqmlvaluetypeproxybinding_p.h \
     $$PWD/qqmlfile.h \
     $$PWD/qqmlbundle_p.h \
-    $$PWD/qqmlmemoryprofiler_p.h
+    $$PWD/qqmlmemoryprofiler_p.h \
+    $$PWD/qqmlconnections_p.h \
+    $$PWD/qqmltimer_p.h \
+    $$PWD/qqmlbind_p.h
+
 
 include(parser/parser.pri)
 include(rewriter/rewriter.pri)
diff --git a/src/quick/util/qquickbind.cpp b/src/qml/qml/qqmlbind.cpp
index 7d3bc06f60..2df9693dfa 100644
--- a/src/quick/util/qquickbind.cpp
+++ b/src/qml/qml/qqmlbind.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qquickbind_p.h"
+#include "qqmlbind_p.h"
 
 #include <private/qqmlnullablevalue_p_p.h>
 #include <private/qqmlproperty_p.h>
@@ -58,11 +58,11 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickBindPrivate : public QObjectPrivate
+class QQmlBindPrivate : public QObjectPrivate
 {
 public:
-    QQuickBindPrivate() : componentComplete(true), obj(0), prevBind(0) {}
-    ~QQuickBindPrivate() { if (prevBind) prevBind->destroy(); }
+    QQmlBindPrivate() : componentComplete(true), obj(0), prevBind(0) {}
+    ~QQmlBindPrivate() { if (prevBind) prevBind->destroy(); }
 
     QQmlNullableValue<bool> when;
     bool componentComplete;
@@ -76,7 +76,7 @@ public:
 
 /*!
     \qmltype Binding
-    \instantiates QQuickBind
+    \instantiates QQmlBind
     \inqmlmodule QtQuick 2
     \ingroup qtquick-interceptors
     \brief Enables the arbitrary creation of property bindings
@@ -141,12 +141,12 @@ public:
 
     \sa QtQml
 */
-QQuickBind::QQuickBind(QObject *parent)
-    : QObject(*(new QQuickBindPrivate), parent)
+QQmlBind::QQmlBind(QObject *parent)
+    : QObject(*(new QQmlBindPrivate), parent)
 {
 }
 
-QQuickBind::~QQuickBind()
+QQmlBind::~QQmlBind()
 {
 }
 
@@ -166,15 +166,15 @@ QQuickBind::~QQuickBind()
     When the binding becomes inactive again, any direct bindings that were previously
     set on the property will be restored.
 */
-bool QQuickBind::when() const
+bool QQmlBind::when() const
 {
-    Q_D(const QQuickBind);
+    Q_D(const QQmlBind);
     return d->when;
 }
 
-void QQuickBind::setWhen(bool v)
+void QQmlBind::setWhen(bool v)
 {
-    Q_D(QQuickBind);
+    Q_D(QQmlBind);
     if (!d->when.isNull && d->when == v)
         return;
 
@@ -187,15 +187,15 @@ void QQuickBind::setWhen(bool v)
 
     The object to be updated.
 */
-QObject *QQuickBind::object()
+QObject *QQmlBind::object()
 {
-    Q_D(const QQuickBind);
+    Q_D(const QQmlBind);
     return d->obj;
 }
 
-void QQuickBind::setObject(QObject *obj)
+void QQmlBind::setObject(QObject *obj)
 {
-    Q_D(QQuickBind);
+    Q_D(QQmlBind);
     if (d->obj && d->when.isValid() && d->when) {
         /* if we switch the object at runtime, we need to restore the
            previous binding on the old object before continuing */
@@ -214,15 +214,15 @@ void QQuickBind::setObject(QObject *obj)
 
     The property to be updated.
 */
-QString QQuickBind::property() const
+QString QQmlBind::property() const
 {
-    Q_D(const QQuickBind);
+    Q_D(const QQmlBind);
     return d->propName;
 }
 
-void QQuickBind::setProperty(const QString &p)
+void QQmlBind::setProperty(const QString &p)
 {
-    Q_D(QQuickBind);
+    Q_D(QQmlBind);
     if (!d->propName.isEmpty() && d->when.isValid() && d->when) {
         /* if we switch the property name at runtime, we need to restore the
            previous binding on the old object before continuing */
@@ -242,43 +242,43 @@ void QQuickBind::setProperty(const QString &p)
     The value to be set on the target object and property.  This can be a
     constant (which isn't very useful), or a bound expression.
 */
-QVariant QQuickBind::value() const
+QVariant QQmlBind::value() const
 {
-    Q_D(const QQuickBind);
+    Q_D(const QQmlBind);
     return d->value.value;
 }
 
-void QQuickBind::setValue(const QVariant &v)
+void QQmlBind::setValue(const QVariant &v)
 {
-    Q_D(QQuickBind);
+    Q_D(QQmlBind);
     d->value = v;
     eval();
 }
 
-void QQuickBind::setTarget(const QQmlProperty &p)
+void QQmlBind::setTarget(const QQmlProperty &p)
 {
-    Q_D(QQuickBind);
+    Q_D(QQmlBind);
     d->prop = p;
 }
 
-void QQuickBind::classBegin()
+void QQmlBind::classBegin()
 {
-    Q_D(QQuickBind);
+    Q_D(QQmlBind);
     d->componentComplete = false;
 }
 
-void QQuickBind::componentComplete()
+void QQmlBind::componentComplete()
 {
-    Q_D(QQuickBind);
+    Q_D(QQmlBind);
     d->componentComplete = true;
     if (!d->prop.isValid())
         d->prop = QQmlProperty(d->obj, d->propName);
     eval();
 }
 
-void QQuickBind::eval()
+void QQmlBind::eval()
 {
-    Q_D(QQuickBind);
+    Q_D(QQmlBind);
     if (!d->prop.isValid() || d->value.isNull || !d->componentComplete)
         return;
 
diff --git a/src/quick/util/qquickbind_p.h b/src/qml/qml/qqmlbind_p.h
index ced8aae9b3..02e2767da9 100644
--- a/src/quick/util/qquickbind_p.h
+++ b/src/qml/qml/qqmlbind_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKBIND_H
-#define QQUICKBIND_H
+#ifndef QQMLBIND_H
+#define QQMLBIND_H
 
 #include <qqml.h>
 
@@ -50,11 +50,11 @@ QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QQuickBindPrivate;
-class Q_AUTOTEST_EXPORT QQuickBind : public QObject, public QQmlPropertyValueSource, public QQmlParserStatus
+class QQmlBindPrivate;
+class Q_AUTOTEST_EXPORT QQmlBind : public QObject, public QQmlPropertyValueSource, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QQuickBind)
+    Q_DECLARE_PRIVATE(QQmlBind)
     Q_INTERFACES(QQmlParserStatus)
     Q_INTERFACES(QQmlPropertyValueSource)
     Q_PROPERTY(QObject *target READ object WRITE setObject)
@@ -63,8 +63,8 @@ class Q_AUTOTEST_EXPORT QQuickBind : public QObject, public QQmlPropertyValueSou
     Q_PROPERTY(bool when READ when WRITE setWhen)
 
 public:
-    QQuickBind(QObject *parent=0);
-    ~QQuickBind();
+    QQmlBind(QObject *parent=0);
+    ~QQmlBind();
 
     bool when() const;
     void setWhen(bool);
@@ -89,7 +89,7 @@ private:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickBind)
+QML_DECLARE_TYPE(QQmlBind)
 
 QT_END_HEADER
 
diff --git a/src/quick/util/qquickconnections.cpp b/src/qml/qml/qqmlconnections.cpp
index ea3628c7fd..ab631ed3b2 100644
--- a/src/quick/util/qquickconnections.cpp
+++ b/src/qml/qml/qqmlconnections.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qquickconnections_p.h"
+#include "qqmlconnections_p.h"
 
 #include <private/qqmlexpression_p.h>
 #include <private/qqmlproperty_p.h>
@@ -55,10 +55,10 @@
 
 QT_BEGIN_NAMESPACE
 
-class QQuickConnectionsPrivate : public QObjectPrivate
+class QQmlConnectionsPrivate : public QObjectPrivate
 {
 public:
-    QQuickConnectionsPrivate() : target(0), targetSet(false), ignoreUnknownSignals(false), componentcomplete(true) {}
+    QQmlConnectionsPrivate() : target(0), targetSet(false), ignoreUnknownSignals(false), componentcomplete(true) {}
 
     QList<QQmlBoundSignal*> boundsignals;
     QObject *target;
@@ -72,7 +72,7 @@ public:
 
 /*!
     \qmltype Connections
-    \instantiates QQuickConnections
+    \instantiates QQmlConnections
     \inqmlmodule QtQuick 2
     \ingroup qtquick-interceptors
     \brief Describes generalized connections to signals
@@ -128,12 +128,12 @@ public:
 
     \sa QtQml
 */
-QQuickConnections::QQuickConnections(QObject *parent) :
-    QObject(*(new QQuickConnectionsPrivate), parent)
+QQmlConnections::QQmlConnections(QObject *parent) :
+    QObject(*(new QQmlConnectionsPrivate), parent)
 {
 }
 
-QQuickConnections::~QQuickConnections()
+QQmlConnections::~QQmlConnections()
 {
 }
 
@@ -146,9 +146,9 @@ QQuickConnections::~QQuickConnections()
     If set to null, no connection is made and any signal handlers are ignored
     until the target is not null.
 */
-QObject *QQuickConnections::target() const
+QObject *QQmlConnections::target() const
 {
-    Q_D(const QQuickConnections);
+    Q_D(const QQmlConnections);
     return d->targetSet ? d->target : parent();
 }
 
@@ -162,9 +162,9 @@ private:
     QQmlBoundSignal *m_signal;
 };
 
-void QQuickConnections::setTarget(QObject *obj)
+void QQmlConnections::setTarget(QObject *obj)
 {
-    Q_D(QQuickConnections);
+    Q_D(QQmlConnections);
     d->targetSet = true; // even if setting to 0, it is *set*
     if (d->target == obj)
         return;
@@ -191,15 +191,15 @@ void QQuickConnections::setTarget(QObject *obj)
     This is useful if you intend to connect to different types of objects, handling
     a different set of signals for each object.
 */
-bool QQuickConnections::ignoreUnknownSignals() const
+bool QQmlConnections::ignoreUnknownSignals() const
 {
-    Q_D(const QQuickConnections);
+    Q_D(const QQmlConnections);
     return d->ignoreUnknownSignals;
 }
 
-void QQuickConnections::setIgnoreUnknownSignals(bool ignore)
+void QQmlConnections::setIgnoreUnknownSignals(bool ignore)
 {
-    Q_D(QQuickConnections);
+    Q_D(QQmlConnections);
     d->ignoreUnknownSignals = ignore;
 }
 
@@ -218,7 +218,7 @@ QQmlConnectionsParser::compile(const QList<QQmlCustomParserProperty> &props)
         int propColumn = props.at(ii).location().column;
 
         if (!propName.startsWith(QLatin1String("on")) || !propName.at(2).isUpper()) {
-            error(props.at(ii), QQuickConnections::tr("Cannot assign to non-existent property \"%1\"").arg(propName));
+            error(props.at(ii), QQmlConnections::tr("Cannot assign to non-existent property \"%1\"").arg(propName));
             return QByteArray();
         }
 
@@ -228,10 +228,10 @@ QQmlConnectionsParser::compile(const QList<QQmlCustomParserProperty> &props)
             const QVariant &value = values.at(i);
 
             if (value.userType() == qMetaTypeId<QQmlCustomParserNode>()) {
-                error(props.at(ii), QQuickConnections::tr("Connections: nested objects not allowed"));
+                error(props.at(ii), QQmlConnections::tr("Connections: nested objects not allowed"));
                 return QByteArray();
             } else if (value.userType() == qMetaTypeId<QQmlCustomParserProperty>()) {
-                error(props.at(ii), QQuickConnections::tr("Connections: syntax error"));
+                error(props.at(ii), QQmlConnections::tr("Connections: syntax error"));
                 return QByteArray();
             } else {
                 QQmlScript::Variant v = qvariant_cast<QQmlScript::Variant>(value);
@@ -241,7 +241,7 @@ QQmlConnectionsParser::compile(const QList<QQmlCustomParserProperty> &props)
                     ds << propLine;
                     ds << propColumn;
                 } else {
-                    error(props.at(ii), QQuickConnections::tr("Connections: script expected"));
+                    error(props.at(ii), QQmlConnections::tr("Connections: script expected"));
                     return QByteArray();
                 }
             }
@@ -254,15 +254,15 @@ QQmlConnectionsParser::compile(const QList<QQmlCustomParserProperty> &props)
 void QQmlConnectionsParser::setCustomData(QObject *object,
                                             const QByteArray &data)
 {
-    QQuickConnectionsPrivate *p =
-        static_cast<QQuickConnectionsPrivate *>(QObjectPrivate::get(object));
+    QQmlConnectionsPrivate *p =
+        static_cast<QQmlConnectionsPrivate *>(QObjectPrivate::get(object));
     p->data = data;
 }
 
 
-void QQuickConnections::connectSignals()
+void QQmlConnections::connectSignals()
 {
-    Q_D(QQuickConnections);
+    Q_D(QQmlConnections);
     if (!d->componentcomplete || (d->targetSet && !target()))
         return;
 
@@ -305,15 +305,15 @@ void QQuickConnections::connectSignals()
     }
 }
 
-void QQuickConnections::classBegin()
+void QQmlConnections::classBegin()
 {
-    Q_D(QQuickConnections);
+    Q_D(QQmlConnections);
     d->componentcomplete=false;
 }
 
-void QQuickConnections::componentComplete()
+void QQmlConnections::componentComplete()
 {
-    Q_D(QQuickConnections);
+    Q_D(QQmlConnections);
     d->componentcomplete=true;
     connectSignals();
 }
diff --git a/src/quick/util/qquickconnections_p.h b/src/qml/qml/qqmlconnections_p.h
index 0a8e716b8a..5791166efe 100644
--- a/src/quick/util/qquickconnections_p.h
+++ b/src/qml/qml/qqmlconnections_p.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKCONNECTIONS_H
-#define QQUICKCONNECTIONS_H
+#ifndef QQMLCONNECTIONS_H
+#define QQMLCONNECTIONS_H
 
 #include <qqml.h>
 #include <private/qqmlcustomparser_p.h>
@@ -54,19 +54,19 @@ QT_BEGIN_NAMESPACE
 
 class QQmlBoundSignal;
 class QQmlContext;
-class QQuickConnectionsPrivate;
-class Q_AUTOTEST_EXPORT QQuickConnections : public QObject, public QQmlParserStatus
+class QQmlConnectionsPrivate;
+class Q_AUTOTEST_EXPORT QQmlConnections : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QQuickConnections)
+    Q_DECLARE_PRIVATE(QQmlConnections)
 
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(QObject *target READ target WRITE setTarget NOTIFY targetChanged)
     Q_PROPERTY(bool ignoreUnknownSignals READ ignoreUnknownSignals WRITE setIgnoreUnknownSignals)
 
 public:
-    QQuickConnections(QObject *parent=0);
-    ~QQuickConnections();
+    QQmlConnections(QObject *parent=0);
+    ~QQmlConnections();
 
     QObject *target() const;
     void setTarget(QObject *);
@@ -93,7 +93,7 @@ public:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickConnections)
+QML_DECLARE_TYPE(QQmlConnections)
 
 QT_END_HEADER
 
diff --git a/src/qml/qml/qqmlengine.cpp b/src/qml/qml/qqmlengine.cpp
index 1376ad7106..9db8927fd9 100644
--- a/src/qml/qml/qqmlengine.cpp
+++ b/src/qml/qml/qqmlengine.cpp
@@ -89,6 +89,10 @@
 
 #include <private/qqmllocale_p.h>
 
+#include "qqmlbind_p.h"
+#include "qqmlconnections_p.h"
+#include "qqmltimer_p.h"
+
 #ifdef Q_OS_WIN // for %APPDATA%
 #include <qt_windows.h>
 #include <qlibrary.h>
@@ -172,6 +176,10 @@ void QQmlEnginePrivate::registerBaseTypes(const char *uri, int versionMajor, int
 {
     qmlRegisterType<QQmlComponent>(uri,versionMajor,versionMinor,"Component");
     qmlRegisterType<QObject>(uri,versionMajor,versionMinor,"QtObject");
+    qmlRegisterType<QQmlBind>(uri, versionMajor, versionMinor,"Binding");
+    qmlRegisterType<QQmlConnections>(uri, versionMajor, versionMinor,"Connections");
+    qmlRegisterType<QQmlTimer>(uri, versionMajor, versionMinor,"Timer");
+    qmlRegisterCustomType<QQmlConnections>(uri, versionMajor, versionMinor,"Connections", new QQmlConnectionsParser);
 }
 
 
diff --git a/src/quick/util/qquicktimer.cpp b/src/qml/qml/qqmltimer.cpp
index c7cdc70bc6..c07a28c506 100644
--- a/src/quick/util/qquicktimer.cpp
+++ b/src/qml/qml/qqmltimer.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "qquicktimer_p.h"
+#include "qqmltimer_p.h"
 
 #include <QtCore/qcoreapplication.h>
 #include "private/qpauseanimationjob_p.h"
@@ -51,16 +51,16 @@ QT_BEGIN_NAMESPACE
 
 
 
-class QQuickTimerPrivate : public QObjectPrivate, public QAnimationJobChangeListener
+class QQmlTimerPrivate : public QObjectPrivate, public QAnimationJobChangeListener
 {
-    Q_DECLARE_PUBLIC(QQuickTimer)
+    Q_DECLARE_PUBLIC(QQmlTimer)
 public:
-    QQuickTimerPrivate()
+    QQmlTimerPrivate()
         : interval(1000), running(false), repeating(false), triggeredOnStart(false)
         , classBegun(false), componentComplete(false), firstTick(true) {}
 
     virtual void animationFinished(QAbstractAnimationJob *);
-    virtual void animationCurrentLoopChanged(QAbstractAnimationJob *)  { Q_Q(QQuickTimer); q->ticked(); }
+    virtual void animationCurrentLoopChanged(QAbstractAnimationJob *)  { Q_Q(QQmlTimer); q->ticked(); }
 
     int interval;
     QPauseAnimationJob pause;
@@ -74,7 +74,7 @@ public:
 
 /*!
     \qmltype Timer
-    \instantiates QQuickTimer
+    \instantiates QQmlTimer
     \inqmlmodule QtQuick 2
     \ingroup qtquick-interceptors
     \brief Triggers a handler at a specified interval
@@ -112,10 +112,10 @@ public:
     \sa {declarative/toys/clocks}{Clocks example}
 */
 
-QQuickTimer::QQuickTimer(QObject *parent)
-    : QObject(*(new QQuickTimerPrivate), parent)
+QQmlTimer::QQmlTimer(QObject *parent)
+    : QObject(*(new QQmlTimerPrivate), parent)
 {
-    Q_D(QQuickTimer);
+    Q_D(QQmlTimer);
     d->pause.addAnimationChangeListener(d, QAbstractAnimationJob::Completion | QAbstractAnimationJob::CurrentLoop);
     d->pause.setLoopCount(1);
     d->pause.setDuration(d->interval);
@@ -128,9 +128,9 @@ QQuickTimer::QQuickTimer(QObject *parent)
 
     The default interval is 1000 milliseconds.
 */
-void QQuickTimer::setInterval(int interval)
+void QQmlTimer::setInterval(int interval)
 {
-    Q_D(QQuickTimer);
+    Q_D(QQmlTimer);
     if (interval != d->interval) {
         d->interval = interval;
         update();
@@ -138,9 +138,9 @@ void QQuickTimer::setInterval(int interval)
     }
 }
 
-int QQuickTimer::interval() const
+int QQmlTimer::interval() const
 {
-    Q_D(const QQuickTimer);
+    Q_D(const QQmlTimer);
     return d->interval;
 }
 
@@ -155,15 +155,15 @@ int QQuickTimer::interval() const
 
     \sa repeat
 */
-bool QQuickTimer::isRunning() const
+bool QQmlTimer::isRunning() const
 {
-    Q_D(const QQuickTimer);
+    Q_D(const QQmlTimer);
     return d->running;
 }
 
-void QQuickTimer::setRunning(bool running)
+void QQmlTimer::setRunning(bool running)
 {
-    Q_D(QQuickTimer);
+    Q_D(QQmlTimer);
     if (d->running != running) {
         d->running = running;
         d->firstTick = true;
@@ -183,15 +183,15 @@ void QQuickTimer::setRunning(bool running)
 
     \sa running
 */
-bool QQuickTimer::isRepeating() const
+bool QQmlTimer::isRepeating() const
 {
-    Q_D(const QQuickTimer);
+    Q_D(const QQmlTimer);
     return d->repeating;
 }
 
-void QQuickTimer::setRepeating(bool repeating)
+void QQmlTimer::setRepeating(bool repeating)
 {
-    Q_D(QQuickTimer);
+    Q_D(QQmlTimer);
     if (repeating != d->repeating) {
         d->repeating = repeating;
         update();
@@ -216,15 +216,15 @@ void QQuickTimer::setRepeating(bool repeating)
 
     \sa running
 */
-bool QQuickTimer::triggeredOnStart() const
+bool QQmlTimer::triggeredOnStart() const
 {
-    Q_D(const QQuickTimer);
+    Q_D(const QQmlTimer);
     return d->triggeredOnStart;
 }
 
-void QQuickTimer::setTriggeredOnStart(bool triggeredOnStart)
+void QQmlTimer::setTriggeredOnStart(bool triggeredOnStart)
 {
-    Q_D(QQuickTimer);
+    Q_D(QQmlTimer);
     if (d->triggeredOnStart != triggeredOnStart) {
         d->triggeredOnStart = triggeredOnStart;
         update();
@@ -239,7 +239,7 @@ void QQuickTimer::setTriggeredOnStart(bool triggeredOnStart)
     If the timer is already running, calling this method has no effect.  The
     \c running property will be true following a call to \c start().
 */
-void QQuickTimer::start()
+void QQmlTimer::start()
 {
     setRunning(true);
 }
@@ -251,7 +251,7 @@ void QQuickTimer::start()
     If the timer is not running, calling this method has no effect.  The
     \c running property will be false following a call to \c stop().
 */
-void QQuickTimer::stop()
+void QQmlTimer::stop()
 {
     setRunning(false);
 }
@@ -264,15 +264,15 @@ void QQuickTimer::stop()
     stopped, reset to initial state and started.  The \c running property
     will be true following a call to \c restart().
 */
-void QQuickTimer::restart()
+void QQmlTimer::restart()
 {
     setRunning(false);
     setRunning(true);
 }
 
-void QQuickTimer::update()
+void QQmlTimer::update()
 {
-    Q_D(QQuickTimer);
+    Q_D(QQmlTimer);
     if (d->classBegun && !d->componentComplete)
         return;
     d->pause.stop();
@@ -288,15 +288,15 @@ void QQuickTimer::update()
     }
 }
 
-void QQuickTimer::classBegin()
+void QQmlTimer::classBegin()
 {
-    Q_D(QQuickTimer);
+    Q_D(QQmlTimer);
     d->classBegun = true;
 }
 
-void QQuickTimer::componentComplete()
+void QQmlTimer::componentComplete()
 {
-    Q_D(QQuickTimer);
+    Q_D(QQmlTimer);
     d->componentComplete = true;
     update();
 }
@@ -306,17 +306,17 @@ void QQuickTimer::componentComplete()
 
     This handler is called when the Timer is triggered.
 */
-void QQuickTimer::ticked()
+void QQmlTimer::ticked()
 {
-    Q_D(QQuickTimer);
+    Q_D(QQmlTimer);
     if (d->running && (d->pause.currentTime() > 0 || (d->triggeredOnStart && d->firstTick)))
         emit triggered();
     d->firstTick = false;
 }
 
-void QQuickTimerPrivate::animationFinished(QAbstractAnimationJob *)
+void QQmlTimerPrivate::animationFinished(QAbstractAnimationJob *)
 {
-    Q_Q(QQuickTimer);
+    Q_Q(QQmlTimer);
     if (repeating || !running)
         return;
     running = false;
diff --git a/src/quick/util/qquicktimer_p.h b/src/qml/qml/qqmltimer_p.h
index 91bac9e9c0..ec9046d945 100644
--- a/src/quick/util/qquicktimer_p.h
+++ b/src/qml/qml/qqmltimer_p.h
@@ -39,24 +39,24 @@
 **
 ****************************************************************************/
 
-#ifndef QQUICKTIMER_H
-#define QQUICKTIMER_H
+#ifndef QQMLTIMER_H
+#define QQMLTIMER_H
 
 #include <qqml.h>
 
 #include <QtCore/qobject.h>
 
-#include <private/qtquickglobal_p.h>
+#include <private/qtqmlglobal_p.h>
 
 QT_BEGIN_HEADER
 
 QT_BEGIN_NAMESPACE
 
-class QQuickTimerPrivate;
-class Q_AUTOTEST_EXPORT QQuickTimer : public QObject, public QQmlParserStatus
+class QQmlTimerPrivate;
+class Q_AUTOTEST_EXPORT QQmlTimer : public QObject, public QQmlParserStatus
 {
     Q_OBJECT
-    Q_DECLARE_PRIVATE(QQuickTimer)
+    Q_DECLARE_PRIVATE(QQmlTimer)
     Q_INTERFACES(QQmlParserStatus)
     Q_PROPERTY(int interval READ interval WRITE setInterval NOTIFY intervalChanged)
     Q_PROPERTY(bool running READ isRunning WRITE setRunning NOTIFY runningChanged)
@@ -65,7 +65,7 @@ class Q_AUTOTEST_EXPORT QQuickTimer : public QObject, public QQmlParserStatus
     Q_PROPERTY(QObject *parent READ parent CONSTANT)
 
 public:
-    QQuickTimer(QObject *parent=0);
+    QQmlTimer(QObject *parent=0);
 
     void setInterval(int interval);
     int interval() const;
@@ -104,7 +104,7 @@ private Q_SLOTS:
 
 QT_END_NAMESPACE
 
-QML_DECLARE_TYPE(QQuickTimer)
+QML_DECLARE_TYPE(QQmlTimer)
 
 QT_END_HEADER
 
diff --git a/src/quick/util/qquickutilmodule.cpp b/src/quick/util/qquickutilmodule.cpp
index 7ecb792b73..0491e941f4 100644
--- a/src/quick/util/qquickutilmodule.cpp
+++ b/src/quick/util/qquickutilmodule.cpp
@@ -43,8 +43,6 @@
 #include "qquickanimation_p.h"
 #include "qquickanimation_p_p.h"
 #include "qquickbehavior_p.h"
-#include "qquickbind_p.h"
-#include "qquickconnections_p.h"
 #include "qquicksmoothedanimation_p.h"
 #include "qquickfontloader_p.h"
 #include "qquickpackage_p.h"
@@ -55,7 +53,6 @@
 #include "qquickstate_p.h"
 #include "qquickstate_p_p.h"
 #include "qquicksystempalette_p.h"
-#include "qquicktimer_p.h"
 #include "qquicktransition_p.h"
 #include <qqmlinfo.h>
 #include <private/qqmltypenotavailable_p.h>
@@ -72,9 +69,7 @@ void QQuickUtilModule::defineModule()
     qmlRegisterUncreatableType<QQuickAbstractAnimation>("QtQuick",2,0,"Animation",QQuickAbstractAnimation::tr("Animation is an abstract class"));
 
     qmlRegisterType<QQuickBehavior>("QtQuick",2,0,"Behavior");
-    qmlRegisterType<QQuickBind>("QtQuick",2,0,"Binding");
     qmlRegisterType<QQuickColorAnimation>("QtQuick",2,0,"ColorAnimation");
-    qmlRegisterType<QQuickConnections>("QtQuick",2,0,"Connections");
     qmlRegisterType<QQuickSmoothedAnimation>("QtQuick",2,0,"SmoothedAnimation");
     qmlRegisterType<QQuickFontLoader>("QtQuick",2,0,"FontLoader");
     qmlRegisterType<QQuickNumberAnimation>("QtQuick",2,0,"NumberAnimation");
@@ -92,12 +87,10 @@ void QQuickUtilModule::defineModule()
     qmlRegisterType<QQuickStateGroup>("QtQuick",2,0,"StateGroup");
     qmlRegisterType<QQuickState>("QtQuick",2,0,"State");
     qmlRegisterType<QQuickSystemPalette>("QtQuick",2,0,"SystemPalette");
-    qmlRegisterType<QQuickTimer>("QtQuick",2,0,"Timer");
     qmlRegisterType<QQuickTransition>("QtQuick",2,0,"Transition");
     qmlRegisterType<QQuickVector3dAnimation>("QtQuick",2,0,"Vector3dAnimation");
 
     qmlRegisterType<QQuickStateOperation>();
 
     qmlRegisterCustomType<QQuickPropertyChanges>("QtQuick",2,0,"PropertyChanges", new QQuickPropertyChangesParser);
-    qmlRegisterCustomType<QQuickConnections>("QtQuick",2,0,"Connections", new QQmlConnectionsParser);
 }
diff --git a/src/quick/util/util.pri b/src/quick/util/util.pri
index 3d93b9f2f5..7a56a95314 100644
--- a/src/quick/util/util.pri
+++ b/src/quick/util/util.pri
@@ -1,7 +1,6 @@
 SOURCES += \
     $$PWD/qquickapplication.cpp\
     $$PWD/qquickutilmodule.cpp\
-    $$PWD/qquickconnections.cpp \
     $$PWD/qquickpackage.cpp \
     $$PWD/qquickanimation.cpp \
     $$PWD/qquicksystempalette.cpp \
@@ -16,8 +15,6 @@ SOURCES += \
     $$PWD/qquicktransition.cpp \
     $$PWD/qquicklistaccessor.cpp \
     $$PWD/qquicktimeline.cpp \
-    $$PWD/qquicktimer.cpp \
-    $$PWD/qquickbind.cpp \
     $$PWD/qquickpixmapcache.cpp \
     $$PWD/qquickbehavior.cpp \
     $$PWD/qquickfontloader.cpp \
@@ -34,7 +31,6 @@ SOURCES += \
 HEADERS += \
     $$PWD/qquickapplication_p.h\
     $$PWD/qquickutilmodule_p.h\
-    $$PWD/qquickconnections_p.h \
     $$PWD/qquickpackage_p.h \
     $$PWD/qquickanimation_p.h \
     $$PWD/qquickanimation_p_p.h \
@@ -52,8 +48,6 @@ HEADERS += \
     $$PWD/qquicktransition_p.h \
     $$PWD/qquicklistaccessor_p.h \
     $$PWD/qquicktimeline_p_p.h \
-    $$PWD/qquicktimer_p.h \
-    $$PWD/qquickbind_p.h \
     $$PWD/qquickpixmapcache_p.h \
     $$PWD/qquickbehavior_p.h \
     $$PWD/qquickfontloader_p.h \