Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7-integration

* '4.7' of scm.dev.nokia.troll.no:qt/qt-qml: (135 commits)
  Do not treat images in qml examples differently.
  Replace Flickable overshoot property with boundsBehavior
  Autotests and doc
  Give error on attempt to import types from too-early version number.
  Remove (undocumented) QML bindings for effects.
  De-straighten them lines.
  Doc: fix QStringList model doc (really).
  Doc: fix QStringList model docs
  Change return type to match value().
  Add duration and easing properties to AnchorAnimation.
  Autotest
  Remove dead code
  Compile on Windows (export decl fix).
  Fix versioning of Qt Declarative's in-built types
  Fixed declarative/parserstress autotest.
  Fix parsing of regular expression literals.
  Fill out QGraphicsLayout bindings
  Update test files to new syntax
  Compile without Qt3 support.
  Ensure workerscript.qml works (autotested).
  ...

1 files changed, 5 insertions, 4 deletions

diff --git a/src/declarative/util/qdeclarativefontloader.cpp b/src/declarative/util/qdeclarativefontloader.cpp
index b577b81..4115193 100644
--- a/src/declarative/util/qdeclarativefontloader.cpp
+++ b/src/declarative/util/qdeclarativefontloader.cpp
@@ -53,6 +53,7 @@
 #include <QFontDatabase>
 
 #include <private/qobject_p.h>
+#include <qdeclarativeinfo.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -136,7 +137,7 @@ void QDeclarativeFontLoader::setSource(const QUrl &url)
             d->status = QDeclarativeFontLoader::Ready;
         } else {
             d->status = QDeclarativeFontLoader::Error;
-            qWarning() << "Cannot load font:" << url;
+            qmlInfo(this) << "Cannot load font: \"" << url.toString() << "\"";
         }
         emit statusChanged();
     } else
@@ -181,7 +182,7 @@ void QDeclarativeFontLoader::setName(const QString &name)
 }
 
 /*!
-    \qmlproperty enum FontLoader::status
+    \qmlproperty enumeration FontLoader::status
 
     This property holds the status of font loading.  It can be one of:
     \list
@@ -231,7 +232,7 @@ void QDeclarativeFontLoader::replyFinished()
             d->addFontToDatabase(ba);
         } else {
             d->status = Error;
-            qWarning() << "Cannot load font:" << d->reply->url();
+            qmlInfo(this) << "Cannot load font: \"" << d->reply->url().toString() << "\"";
             emit statusChanged();
         }
         d->reply->deleteLater();
@@ -250,7 +251,7 @@ void QDeclarativeFontLoaderPrivate::addFontToDatabase(const QByteArray &ba)
         status = QDeclarativeFontLoader::Ready;
     } else {
         status = QDeclarativeFontLoader::Error;
-        qWarning() << "Cannot load font:" << url;
+        qmlInfo(q) << "Cannot load font: \"" << url.toString() << "\"";
     }
     emit q->statusChanged();
 }