Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration

* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
  Compile.
  Fix recursion in QScriptEngine::toScriptValue
  Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4
  Remove usage of deprecated QScriptValue* function
  Deprecate qScriptValueFromQMetaObject, qScriptValueToValue, qScriptValueFromValue
  Remove the use of deprecated qVariant*
  Deprecate qVariantValue qVariantCanConvert qVariantFromValue qVariantSetValue
  Remove the use of deprecated qFindChild(ren)
  Deprecated qFindChild and qFindChildren
  Implement QFontMetrics::inFont(uint) which takes UCS-4 encoded char
  tst_qsharedpointer.cpp: fix compilation
  Fix compilation with QT_NO_DEBUG_STREAM
  QImage::fill() overloads that take QColor and Qt::GlobalColor
  qmake: qmakeDeleteCacheClear() function can be template now
  It is no longer necessary to check for QT_NO_MEMBER_TEMPLATES
  It is no longer necessary to check for QT_NO_PARTIAL_TEMPLATE_SPECIALIZATION
  Fix MS Visual C++ 6.0 references in the documentation
  Remove obsolete code & workarounds for unsupported versions of MS Visual C++

1 files changed, 2 insertions, 2 deletions

diff --git a/demos/browser/browserapplication.cpp b/demos/browser/browserapplication.cpp
index ed95d32..633307c 100644
--- a/demos/browser/browserapplication.cpp
+++ b/demos/browser/browserapplication.cpp
@@ -231,14 +231,14 @@ void BrowserApplication::loadSettings()
     QString standardFontFamily = defaultSettings->fontFamily(QWebSettings::StandardFont);
     int standardFontSize = defaultSettings->fontSize(QWebSettings::DefaultFontSize);
     QFont standardFont = QFont(standardFontFamily, standardFontSize);
-    standardFont = qVariantValue<QFont>(settings.value(QLatin1String("standardFont"), standardFont));
+    standardFont = qvariant_cast<QFont>(settings.value(QLatin1String("standardFont"), standardFont));
     defaultSettings->setFontFamily(QWebSettings::StandardFont, standardFont.family());
     defaultSettings->setFontSize(QWebSettings::DefaultFontSize, standardFont.pointSize());
 
     QString fixedFontFamily = defaultSettings->fontFamily(QWebSettings::FixedFont);
     int fixedFontSize = defaultSettings->fontSize(QWebSettings::DefaultFixedFontSize);
     QFont fixedFont = QFont(fixedFontFamily, fixedFontSize);
-    fixedFont = qVariantValue<QFont>(settings.value(QLatin1String("fixedFont"), fixedFont));
+    fixedFont = qvariant_cast<QFont>(settings.value(QLatin1String("fixedFont"), fixedFont));
     defaultSettings->setFontFamily(QWebSettings::FixedFont, fixedFont.family());
     defaultSettings->setFontSize(QWebSettings::DefaultFixedFontSize, fixedFont.pointSize());