Merge branch 'master' of ../qt-qml-staging

7 files changed, 71 insertions, 33 deletions

diff --git a/src/declarative/qml/qdeclarativeboundsignal.cpp b/src/declarative/qml/qdeclarativeboundsignal.cpp
index 28dfea9..47a15cb 100644
--- a/src/declarative/qml/qdeclarativeboundsignal.cpp
+++ b/src/declarative/qml/qdeclarativeboundsignal.cpp
@@ -225,9 +225,35 @@ QDeclarativeBoundSignalParameters::QDeclarativeBoundSignalParameters(const QMeta
             QMetaPropertyBuilder prop = mob.addProperty(name, "QObject*");
             prop.setWritable(false);
         } else {
+            QByteArray propType = type;
+            if (t >= QVariant::UserType || t == QVariant::Invalid) {
+                //copy of QDeclarativeObjectScriptClass::enumType()
+                QByteArray scope;
+                QByteArray name;
+                int scopeIdx = propType.lastIndexOf("::");
+                if (scopeIdx != -1) {
+                    scope = propType.left(scopeIdx);
+                    name = propType.mid(scopeIdx + 2);
+                } else {
+                    name = propType;
+                }
+                const QMetaObject *meta;
+                if (scope == "Qt")
+                    meta = &QObject::staticQtMetaObject;
+                else
+                    meta = parent->parent()->metaObject();   //### assumes parent->parent()
+                for (int i = meta->enumeratorCount() - 1; i >= 0; --i) {
+                    QMetaEnum m = meta->enumerator(i);
+                    if ((m.name() == name) && (scope.isEmpty() || (m.scope() == scope))) {
+                        t = QVariant::Int;
+                        propType = "int";
+                        break;
+                    }
+                }
+            }
             if (QDeclarativeMetaType::canCopy(t)) {
                 types[ii] = t;
-                QMetaPropertyBuilder prop = mob.addProperty(name, type);
+                QMetaPropertyBuilder prop = mob.addProperty(name, propType);
                 prop.setWritable(false);
             } else {
                 types[ii] = 0x80000000 | t;
diff --git a/src/declarative/qml/qdeclarativecomponent.cpp b/src/declarative/qml/qdeclarativecomponent.cpp
index fc393d1..276f790 100644
--- a/src/declarative/qml/qdeclarativecomponent.cpp
+++ b/src/declarative/qml/qdeclarativecomponent.cpp
@@ -137,7 +137,7 @@ class QByteArray;
     }
     \endcode
 
-    \sa {Using QML in C++ Applications}, {Integrating QML with existing Qt UI code}
+    \sa {Using QML Bindings in C++ Applications}, {Integrating QML Code with Existing Qt UI Code}
 */
 
 /*!
@@ -643,11 +643,11 @@ QDeclarativeComponent::QDeclarativeComponent(QDeclarativeComponentPrivate &dd, Q
     The \a properties argument is specified as a map of property-value items. For example, the code
     below creates an object with initial \c x and \c y values of 100 and 200, respectively:
 
-    \qml
+    \js
         var component = Qt.createComponent("Button.qml");
         if (component.status == Component.Ready)
             component.createObject(parent, {"x": 100, "y": 100});
-    \endqml
+    \endjs
 
     Dynamically created instances can be deleted with the \c destroy() method.
     See \l {Dynamic Object Management in QML} for more information.
diff --git a/src/declarative/qml/qdeclarativecontext.cpp b/src/declarative/qml/qdeclarativecontext.cpp
index dc6b085..7637b72 100644
--- a/src/declarative/qml/qdeclarativecontext.cpp
+++ b/src/declarative/qml/qdeclarativecontext.cpp
@@ -72,10 +72,10 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     Contexts allow data to be exposed to the QML components instantiated by the
     QML engine.
 
-    Each QDeclarativeContext contains a set of properties, distinct from its QObject 
-    properties, that allow data to be explicitly bound to a context by name.  The 
-    context properties are defined and updated by calling 
-    QDeclarativeContext::setContextProperty().  The following example shows a Qt model 
+    Each QDeclarativeContext contains a set of properties, distinct from its QObject
+    properties, that allow data to be explicitly bound to a context by name.  The
+    context properties are defined and updated by calling
+    QDeclarativeContext::setContextProperty().  The following example shows a Qt model
     being bound to a context and then accessed from a QML file.
 
     \code
@@ -97,8 +97,8 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     To simplify binding and maintaining larger data sets, a context object can be set
     on a QDeclarativeContext.  All the properties of the context object are available
     by name in the context, as though they were all individually added through calls
-    to QDeclarativeContext::setContextProperty().  Changes to the property's values are 
-    detected through the property's notify signal.  Setting a context object is both 
+    to QDeclarativeContext::setContextProperty().  Changes to the property's values are
+    detected through the property's notify signal.  Setting a context object is both
     faster and easier than manually adding and maintaing context property values.
 
     The following example has the same effect as the previous one, but it uses a context
@@ -121,7 +121,7 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     component.create(context);
     \endcode
 
-    All properties added explicitly by QDeclarativeContext::setContextProperty() take 
+    All properties added explicitly by QDeclarativeContext::setContextProperty() take
     precedence over the context object's properties.
 
     \section2 The Context Hierarchy
@@ -147,8 +147,8 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     context2->setContextProperty("b", 15);
     \endcode
 
-    While QML objects instantiated in a context are not strictly owned by that 
-    context, their bindings are.  If a context is destroyed, the property bindings of 
+    While QML objects instantiated in a context are not strictly owned by that
+    context, their bindings are.  If a context is destroyed, the property bindings of
     outstanding QML objects will stop evaluating.
 
     \warning Setting the context object or adding new context properties after an object
@@ -156,7 +156,7 @@ QDeclarativeContextPrivate::QDeclarativeContextPrivate()
     to reevaluate). Thus whenever possible you should complete "setup" of the context
     before using it to create any objects.
 
-    \sa {Using QML in C++ Applications}
+    \sa {Using QML Bindings in C++ Applications}
 */
 
 /*! \internal */
@@ -223,7 +223,7 @@ QDeclarativeContext::~QDeclarativeContext()
 /*!
     Returns whether the context is valid.
 
-    To be valid, a context must have a engine, and it's contextObject(), if any, 
+    To be valid, a context must have a engine, and it's contextObject(), if any,
     must not have been deleted.
 */
 bool QDeclarativeContext::isValid() const
@@ -384,7 +384,7 @@ QVariant QDeclarativeContext::contextProperty(const QString &name) const
         if (data->contextObject) {
             QObject *obj = data->contextObject;
             QDeclarativePropertyCache::Data local;
-            QDeclarativePropertyCache::Data *property = 
+            QDeclarativePropertyCache::Data *property =
                 QDeclarativePropertyCache::property(data->engine, obj, name, local);
 
             if (property) value = obj->metaObject()->property(property->coreIndex).read(obj);
@@ -461,7 +461,7 @@ QUrl QDeclarativeContext::baseUrl() const
 {
     Q_D(const QDeclarativeContext);
     const QDeclarativeContextData* data = d->data;
-    while (data && data->url.isEmpty()) 
+    while (data && data->url.isEmpty())
         data = data->parent;
 
     if (data)
@@ -515,7 +515,7 @@ QDeclarativeContextData::QDeclarativeContextData(QDeclarativeContext *ctxt)
 
 void QDeclarativeContextData::invalidate()
 {
-    while (childContexts) 
+    while (childContexts)
         childContexts->invalidate();
 
     while (componentAttached) {
@@ -570,7 +570,7 @@ void QDeclarativeContextData::clearContext()
 
 void QDeclarativeContextData::destroy()
 {
-    if (linkedContext) 
+    if (linkedContext)
         linkedContext->destroy();
 
     if (engine) invalidate();
@@ -626,9 +626,9 @@ void QDeclarativeContextData::setParent(QDeclarativeContextData *p)
     }
 }
 
-/* 
-Refreshes all expressions that could possibly depend on this context.  Refreshing flushes all 
-context-tree dependent caches in the expressions, and should occur every time the context tree 
+/*
+Refreshes all expressions that could possibly depend on this context.  Refreshing flushes all
+context-tree dependent caches in the expressions, and should occur every time the context tree
  *structure* (not values) changes.
 */
 void QDeclarativeContextData::refreshExpressions()
@@ -656,7 +656,7 @@ void QDeclarativeContextData::addObject(QObject *o)
     data->outerContext = this;
 
     data->nextContextObject = contextObjects;
-    if (data->nextContextObject) 
+    if (data->nextContextObject)
         data->nextContextObject->prevContextObject = &data->nextContextObject;
     data->prevContextObject = &contextObjects;
     contextObjects = data;
@@ -664,7 +664,7 @@ void QDeclarativeContextData::addObject(QObject *o)
 
 void QDeclarativeContextData::addImportedScript(const QDeclarativeParser::Object::ScriptBlock &script)
 {
-    if (!engine) 
+    if (!engine)
         return;
 
     QDeclarativeEnginePrivate *enginePriv = QDeclarativeEnginePrivate::get(engine);
@@ -684,7 +684,7 @@ void QDeclarativeContextData::addImportedScript(const QDeclarativeParser::Object
 
             scriptContext->pushScope(enginePriv->contextClass->newUrlContext(url));
             scriptContext->pushScope(enginePriv->globalClass->staticGlobalObject());
-        
+
             QScriptValue scope = QScriptDeclarativeClass::newStaticScopeObject(scriptEngine);
             scriptContext->pushScope(scope);
 
@@ -752,7 +752,7 @@ QString QDeclarativeContextData::findObjectId(const QObject *obj) const
     for (int i=0; i<idValueCount; i++) {
         if (idValues[i] == obj)
             return propertyNames->findId(i);
-    }    
+    }
 
     if (linkedContext)
         return linkedContext->findObjectId(obj);
@@ -761,7 +761,7 @@ QString QDeclarativeContextData::findObjectId(const QObject *obj) const
 
 QDeclarativeContext *QDeclarativeContextData::asQDeclarativeContext()
 {
-    if (!publicContext) 
+    if (!publicContext)
         publicContext = new QDeclarativeContext(this);
     return publicContext;
 }
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp
index b7a02f1..9fde18c 100644
--- a/src/declarative/qml/qdeclarativeengine.cpp
+++ b/src/declarative/qml/qdeclarativeengine.cpp
@@ -2117,7 +2117,7 @@ QVariant QDeclarativeEnginePrivate::scriptValueToVariant(const QScriptValue &val
 
   The newly added \a path will be first in the importPathList().
 
-  \sa setImportPathList(), \l {QML Modules}
+  \sa setImportPathList(), {QML Modules}
 */
 void QDeclarativeEngine::addImportPath(const QString& path)
 {
diff --git a/src/declarative/qml/qdeclarativetypeloader.cpp b/src/declarative/qml/qdeclarativetypeloader.cpp
index 36cdde9..26f3996 100644
--- a/src/declarative/qml/qdeclarativetypeloader.cpp
+++ b/src/declarative/qml/qdeclarativetypeloader.cpp
@@ -629,7 +629,18 @@ QDeclarativeTypeLoader::~QDeclarativeTypeLoader()
 }
 
 /*!
-Return a QDeclarativeTypeData for \a url.  The QDeclarativeTypeData may be cached.
+\enum QDeclarativeTypeLoader::Option
+
+This enum defines the options that control the way type data is handled.
+
+\value None             The default value, indicating that no other options
+                        are enabled.
+\value PreserveParser   The parser used to handle the type data is preserved
+                        after the data has been parsed.
+*/
+
+/*!
+Returns a QDeclarativeTypeData for the specified \a url.  The QDeclarativeTypeData may be cached.
 */
 QDeclarativeTypeData *QDeclarativeTypeLoader::get(const QUrl &url)
 {
@@ -650,8 +661,10 @@ QDeclarativeTypeData *QDeclarativeTypeLoader::get(const QUrl &url)
 }
 
 /*!
-Return a QDeclarativeTypeData for \a data with the provided base \a url.  The 
+Returns a QDeclarativeTypeData for the given \a data with the provided base \a url.  The 
 QDeclarativeTypeData will not be cached.
+
+The specified \a options control how the loader handles type data.
 */
 QDeclarativeTypeData *QDeclarativeTypeLoader::get(const QByteArray &data, const QUrl &url, Options options)
 {
diff --git a/src/declarative/qml/qdeclarativetypeloader_p.h b/src/declarative/qml/qdeclarativetypeloader_p.h
index 6938892..7f487a0 100644
--- a/src/declarative/qml/qdeclarativetypeloader_p.h
+++ b/src/declarative/qml/qdeclarativetypeloader_p.h
@@ -79,7 +79,7 @@ public:
         Loading,                 // Prior to data being received and dataReceived() being called
         WaitingForDependencies,  // While there are outstanding addDependency()s
         Complete,                // Finished
-        Error,                   // Error
+        Error                    // Error
     };
 
     enum Type {
diff --git a/src/declarative/qml/qdeclarativevaluetype.cpp b/src/declarative/qml/qdeclarativevaluetype.cpp
index 0f884b6..5b83b4e 100644
--- a/src/declarative/qml/qdeclarativevaluetype.cpp
+++ b/src/declarative/qml/qdeclarativevaluetype.cpp
@@ -42,13 +42,12 @@
 #include "private/qdeclarativevaluetype_p.h"
 
 #include "private/qdeclarativemetatype_p.h"
+#include "private/qfont_p.h"
 
 #include <QtCore/qdebug.h>
 
 QT_BEGIN_NAMESPACE
 
-Q_GUI_EXPORT int qt_defaultDpi();
-
 template<typename T>
 int qmlRegisterValueTypeEnums(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
 {