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: (35 commits)
  doc: Added more DITA output to the XML generator
  Prohibit some property names to be used for dynamic properties
  Updated Harfbuzz from git+ssh://git.freedesktop.org/git/harfbuzz to f0dcb906fe56b5dc06aa305b6cfc821d5dd25a28
  doc: Added more DITA output to the XML generator
  doc: Added more DITA output to the XML generator
  qdoc3: Build fix for regression in f321a3f2b1e
  Clean up HB_Anchor's DeviceTables on failure when loading format 3
  Make sure ValueRecord's DeviceTables is cleaned up on failure
  qdoc3: Build fix for regression in e2f0e728e
  Fix incorrect usage of _HB_OPEN_Free_Device() in CaretValue cleanup
  Fix null HB_Device** dereference on exit in Harfbuzz GPOS code
  Doc: Relicensed the documentation under the GNU FDL version 1.3.
  doc: Added more DITA output to the XML generator
  Designer: Prevent QButtonGroup from being added for Q3ButtonGroup.
  Fix for a leak in the mac style.
  Doc: Fixing bugs to style and script
  doc: Added more DITA output to the XML generator
  Make sure that <br/> is seen as a valid tag in Qt::mightBeRichText()
  Fix compiler warnings in QtGui (text,painting).
  Allow Unix to generate unique UUIDs if /dev/urandom exists.
  ...

5 files changed, 8 insertions, 6 deletions

diff --git a/examples/dbus/remotecontrolledcar/car/car.h b/examples/dbus/remotecontrolledcar/car/car.h
index 5ef046e..c611018 100644
--- a/examples/dbus/remotecontrolledcar/car/car.h
+++ b/examples/dbus/remotecontrolledcar/car/car.h
@@ -41,14 +41,12 @@
 #ifndef CAR_H
 #define CAR_H
 
-#include <QGraphicsItem>
-#include <QObject>
+#include <QGraphicsObject>
 #include <QBrush>
 
-class Car : public QObject, public QGraphicsItem
+class Car : public QGraphicsObject
 {
     Q_OBJECT
-
 public:
     Car();
     QRectF boundingRect() const;
diff --git a/examples/examples.pro b/examples/examples.pro
index 43cad55..9a83216 100644
--- a/examples/examples.pro
+++ b/examples/examples.pro
@@ -30,6 +30,8 @@ SUBDIRS       = \
                 gestures
 }
 
+contains(QT_CONFIG, webkit):SUBDIRS += webkit
+
 symbian: SUBDIRS = \
                 graphicsview \
                 itemviews \
diff --git a/examples/graphicsview/dragdroprobot/coloritem.cpp b/examples/graphicsview/dragdroprobot/coloritem.cpp
index b6113fd..327fa87 100644
--- a/examples/graphicsview/dragdroprobot/coloritem.cpp
+++ b/examples/graphicsview/dragdroprobot/coloritem.cpp
@@ -76,7 +76,7 @@ void ColorItem::paint(QPainter *painter, const QStyleOptionGraphicsItem *option,
 //! [2]
 
 //! [3]
-void ColorItem::mousePressEvent(QGraphicsSceneMouseEvent *event)
+void ColorItem::mousePressEvent(QGraphicsSceneMouseEvent *)
 {
     setCursor(Qt::ClosedHandCursor);
 }
diff --git a/examples/graphicsview/simpleanchorlayout/main.cpp b/examples/graphicsview/simpleanchorlayout/main.cpp
index 9cb4006..942cdc4 100644
--- a/examples/graphicsview/simpleanchorlayout/main.cpp
+++ b/examples/graphicsview/simpleanchorlayout/main.cpp
@@ -49,7 +49,7 @@ public:
     {
     }
 
-    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = 0)
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget * = 0)
     {
         QFont font;
         font.setPixelSize(0.75 * qMin(boundingRect().width(), boundingRect().height()));
diff --git a/examples/multimedia/audiodevices/audiodevices.cpp b/examples/multimedia/audiodevices/audiodevices.cpp
index 5dc2ef1..5ab4918 100644
--- a/examples/multimedia/audiodevices/audiodevices.cpp
+++ b/examples/multimedia/audiodevices/audiodevices.cpp
@@ -58,6 +58,8 @@ QString toString(QAudioFormat::SampleType sampleType)
     case QAudioFormat::Float:
         result = "Float";
         break;
+    case QAudioFormat::Unknown:
+        break;
     }
     return result;
 }