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

* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (32 commits)
  Fix memory leak in QtScript variable object
  doc: Changed some titles so lists of contents sort better.
  QSslSocket: fix security vulnerability with wildcard IP addresses
  doc: Some reorganization of top page topic hierarchy.
  Mac: Fix crash when using style to draw on other things than widgets
  Doc: Adding radius support for CSS3 and webkit
  Correct spelling (UNKOWN -> UNKNOWN) to fix recent test regression
  add performance comparisons to qregexp benchmark
  configure: fix error message when calling config.status
  Fix invalid memory write during recursive timer activation
  Added comment about calendarPopup in setCalendarWidget function documentation.
  doc: Fixed some qdoc errors.
  Correcting spelling mistakes in documentation. Part of fix for QTBUG-11938.
  CreateFileMapping returns NULL on error , only tested with INVALID_HANDLE_VALUE.
  XmlListModel doc fixes
  Mention QML_IMPORT_TRACE in Modules docs
  Merge sections about when property and default state
  Explain Flipable example further
  PathView required some diagonal movement before a drag was initiated.
  doc: Fixed some qdoc errors.
  ...

2 files changed, 2 insertions, 2 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativeitem.cpp b/src/declarative/graphicsitems/qdeclarativeitem.cpp
index 9d782b9..2b41710 100644
--- a/src/declarative/graphicsitems/qdeclarativeitem.cpp
+++ b/src/declarative/graphicsitems/qdeclarativeitem.cpp
@@ -2454,7 +2454,7 @@ QDeclarativeListProperty<QDeclarativeState> QDeclarativeItemPrivate::states()
   }
   \endqml
 
-  \sa {state-transitions}{Transitions}
+  \sa {qdeclarativeanimation.html#transitions}{QML Transitions}
 */
 
 
diff --git a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
index ceb1961..a489b5a 100644
--- a/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
+++ b/src/declarative/graphicsitems/qdeclarativevisualitemmodel.cpp
@@ -525,7 +525,7 @@ QVariant QDeclarativeVisualDataModelDataMetaObject::initialValue(int propId)
             QVariant value = model->m_listModelInterface->data(data->m_index, *it);
             return value;
         } else if (model->m_roles.count() == 1 && propName == "modelData") {
-            //for compatability with other lists, assign modelData if there is only a single role
+            //for compatibility with other lists, assign modelData if there is only a single role
             QVariant value = model->m_listModelInterface->data(data->m_index, model->m_roles.first());
             return value;
         }