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

7 files changed, 47 insertions, 0 deletions

diff --git a/doc/src/declarative/extending.qdoc b/doc/src/declarative/extending.qdoc
index 3acfbdf..5c4d5e7 100644
--- a/doc/src/declarative/extending.qdoc
+++ b/doc/src/declarative/extending.qdoc
@@ -434,6 +434,23 @@ NOTIFY signal in C++.
 
 See also \l {Extending types from QML}.
 
+\section1 Methods
+
+Slots and methods marked Q_INVOKABLE may be called as functions in QML.
+
+\snippet examples/declarative/cppextensions/referenceexamples/methods/example.qml 0
+
+In this example an invitation is added via an \c {invite()} invokable method of
+the BirthdayParty element.  This function is available in QML by marking the \c {invite()}
+method with Q_INVOKABLE in the BirthdayParty class:
+
+\snippet examples/declarative/cppextensions/referenceexamples/methods/birthdayparty.h 0
+
+\l {Extending QML - Methods Example} shows the complete code used to
+implement the invite() method.
+
+The \c {invite()} method is similarly available if it is declared as a slot.
+
 \section1 Property Value Sources
 
 \snippet examples/declarative/cppextensions/referenceexamples/valuesource/example.qml 0
diff --git a/doc/src/declarative/qtdeclarative.qdoc b/doc/src/declarative/qtdeclarative.qdoc
index b4f4c83..f163a66 100644
--- a/doc/src/declarative/qtdeclarative.qdoc
+++ b/doc/src/declarative/qtdeclarative.qdoc
@@ -59,6 +59,16 @@
   Equivalent to  Q_DECLARE_METATYPE(TYPE) and Q_DECLARE_METATYPE(QDeclarativeListProperty<TYPE>)
 */
 
+/*!
+  \macro QML_DECLARE_TYPEINFO(Type,Flags)
+  \relates QDeclarativeEngine
+
+  Declares additional properties of a type.
+  
+  Current the only supported type info is \c QML_HAS_ATTACHED_PROPERTIES which
+  declares that the \c Type supports \l {Attached Properties}.
+*/
+
 
 /*!
   \fn int qmlRegisterType(const char *uri, int versionMajor, int versionMinor, const char *qmlName)
diff --git a/doc/src/examples/qml-examples.qdoc b/doc/src/examples/qml-examples.qdoc
index 0d191c9..b140562 100644
--- a/doc/src/examples/qml-examples.qdoc
+++ b/doc/src/examples/qml-examples.qdoc
@@ -137,6 +137,7 @@
     \o \l {declarative/cppextensions/referenceexamples/grouped}{Grouped Properties}
     \o \l {declarative/cppextensions/referenceexamples/attached}{Attached Properties}
     \o \l {declarative/cppextensions/referenceexamples/signal}{Signal Support}
+    \o \l {declarative/cppextensions/referenceexamples/methods}{Methods Support}
     \o \l {declarative/cppextensions/referenceexamples/valuesource}{Property Value Source}
     \o \l {declarative/cppextensions/referenceexamples/binding}{Binding}
     \endlist
diff --git a/doc/src/examples/qml-extending.qdoc b/doc/src/examples/qml-extending.qdoc
index b419fe4..21ec3bb 100644
--- a/doc/src/examples/qml-extending.qdoc
+++ b/doc/src/examples/qml-extending.qdoc
@@ -253,6 +253,20 @@ This example builds on:
 */
 
 /*!
+\example declarative/cppextensions/referenceexamples/methods
+\title Extending QML - Methods Example
+
+This example builds on:
+\list
+\o \l {Extending QML - Default Property Example}
+\o \l {Extending QML - Inheritance and Coercion Example}
+\o \l {Extending QML - Object and List Property Types Example}
+\o \l {Extending QML - Adding Types Example}
+\endlist
+
+*/
+
+/*!
 \example declarative/cppextensions/referenceexamples/valuesource
 \title Extending QML - Property Value Source Example
 
diff --git a/doc/src/getting-started/examples.qdoc b/doc/src/getting-started/examples.qdoc
index 708c44e..e8c85e6 100644
--- a/doc/src/getting-started/examples.qdoc
+++ b/doc/src/getting-started/examples.qdoc
@@ -255,6 +255,7 @@
     \o \l{graphicsview/flowlayout}{Flow Layout}
     \o \l{graphicsview/simpleanchorlayout}{Simple Anchor Layout}
     \o \l{graphicsview/weatheranchorlayout}{Weather Anchor Layout}
+    \o \l{graphicsview/basicgraphicslayouts}{Basic Graphics Layouts}
     \endlist
 
     Some examples demonstrate the use of graphics effects with canvas items.
@@ -471,6 +472,7 @@
     \o  \l{network/googlesuggest}{Google Suggest}
     \o  \l{network/bearercloud}{Bearer Cloud}\raisedaster
     \o  \l{network/bearermonitor}{Bearer Monitor}
+    \o  \l{network/securesocketclient}{Secure Socket Client}
     \endlist
 
     Examples marked with an asterisk (*) are fully documented.
@@ -609,6 +611,7 @@
     \o \l{sql/querymodel}{Query Model}
     \o \l{sql/relationaltablemodel}{Relational Table Model}
     \o \l{sql/tablemodel}{Table Model}
+    \o \l{sql/masterdetail}{Master Detail}
     \o \l{sql/sqlwidgetmapper}{SQL Widget Mapper}\raisedaster
     \endlist
 
@@ -633,6 +636,7 @@
     \o \l{xml/streambookmarks}{QXmlStream Bookmarks}\raisedaster
     \o \l{xml/rsslisting}{RSS-Listing}
     \o \l{xml/xmlstreamlint}{XML Stream Lint Example}\raisedaster
+    \o \l{xml/htmlinfo}{XML HTML Info}
     \endlist
 
     The XQuery/XPath and XML Schema engines in the QtXmlPatterns modules
diff --git a/doc/src/images/qml-image-example.png b/doc/src/images/qml-image-example.png
index c1951c0..8d9846f 100644
--- a/doc/src/images/qml-image-example.png
+++ b/doc/src/images/qml-image-example.png
diff --git a/doc/src/platforms/x11overlays.qdoc b/doc/src/platforms/x11overlays.qdoc
index 1a03ea6..949a500 100644
--- a/doc/src/platforms/x11overlays.qdoc
+++ b/doc/src/platforms/x11overlays.qdoc
@@ -28,6 +28,7 @@
 /*!
     \page x11overlays.html
     \title How to Use X11 Overlays with Qt
+	\ingroup best-practices
 
     X11 overlays are a powerful mechanism for drawing
     annotations etc., on top of an image without destroying it, thus saving