summaryrefslogtreecommitdiffstats
path: root/examples
diff options
context:
space:
mode:
Diffstat (limited to 'examples')
-rw-r--r--examples/dbus/remotecontrolledcar/car/car.h6
-rw-r--r--examples/examples.pro2
-rw-r--r--examples/graphicsview/dragdroprobot/coloritem.cpp2
-rw-r--r--examples/graphicsview/simpleanchorlayout/main.cpp2
-rw-r--r--examples/multimedia/audiodevices/audiodevices.cpp2
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;
}