diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-22 22:36:13 (GMT) |
---|---|---|
committer | Rohan McGovern <rohan.mcgovern@nokia.com> | 2010-06-22 22:36:13 (GMT) |
commit | 27d59016d35ae84d89e8d09bdadb1c3a89ac3f22 (patch) | |
tree | f493da0591281db183c23c86ecc3dc078009cafa /examples | |
parent | b92a7337d47e8b1be2d65d5a726f7a6f291a65bb (diff) | |
parent | 5d3b132dd94f6c985fa3f9584dedb46823acddfe (diff) | |
download | Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.zip Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.gz Qt-27d59016d35ae84d89e8d09bdadb1c3a89ac3f22.tar.bz2 |
Merge remote branch 'origin/4.7' into qml-4.7
Conflicts:
examples/declarative/modelviews/webview/transparent.qml
Diffstat (limited to 'examples')
13 files changed, 14 insertions, 14 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/declarative/cppextensions/imageprovider/imageprovider.pro b/examples/declarative/cppextensions/imageprovider/imageprovider.pro index f218c30..c7e7843 100644 --- a/examples/declarative/cppextensions/imageprovider/imageprovider.pro +++ b/examples/declarative/cppextensions/imageprovider/imageprovider.pro @@ -19,7 +19,6 @@ ImageProviderCore_sources.path = $$[QT_INSTALL_EXAMPLES]/declarative/imageprovid INSTALLS = sources ImageProviderCore_sources target symbian:{ - load(data_caging_paths) include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.EPOCALLOWDLLDATA = 1 diff --git a/examples/declarative/cppextensions/qwidgets/qwidgets.pro b/examples/declarative/cppextensions/qwidgets/qwidgets.pro index 8d87804..3ec7d29 100644 --- a/examples/declarative/cppextensions/qwidgets/qwidgets.pro +++ b/examples/declarative/cppextensions/qwidgets/qwidgets.pro @@ -14,7 +14,6 @@ target.path += $$[QT_INSTALL_EXAMPLES]/declarative/plugins INSTALLS += sources target symbian:{ - load(data_caging_paths) include($$QT_SOURCE_TREE/examples/symbianpkgrules.pri) TARGET.EPOCALLOWDLLDATA = 1 diff --git a/examples/declarative/modelviews/webview/alerts.qml b/examples/declarative/modelviews/webview/alerts.qml index 1537411..9e3c925 100644 --- a/examples/declarative/modelviews/webview/alerts.qml +++ b/examples/declarative/modelviews/webview/alerts.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import Qt 4.7 -import org.webkit 1.0 +import QtWebKit 1.0 WebView { id: webView diff --git a/examples/declarative/modelviews/webview/autosize.qml b/examples/declarative/modelviews/webview/autosize.qml index 64e3ff1..4a5096e 100644 --- a/examples/declarative/modelviews/webview/autosize.qml +++ b/examples/declarative/modelviews/webview/autosize.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import Qt 4.7 -import org.webkit 1.0 +import QtWebKit 1.0 // The WebView size is determined by the width, height, // preferredWidth, and preferredHeight properties. diff --git a/examples/declarative/modelviews/webview/content/Mapping/Map.qml b/examples/declarative/modelviews/webview/content/Mapping/Map.qml index 99f8479..c2489c5 100644 --- a/examples/declarative/modelviews/webview/content/Mapping/Map.qml +++ b/examples/declarative/modelviews/webview/content/Mapping/Map.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import Qt 4.7 -import org.webkit 1.0 +import QtWebKit 1.0 Item { id: page diff --git a/examples/declarative/modelviews/webview/googlemaps.qml b/examples/declarative/modelviews/webview/googlemaps.qml index 1c99940..361b40c 100644 --- a/examples/declarative/modelviews/webview/googlemaps.qml +++ b/examples/declarative/modelviews/webview/googlemaps.qml @@ -46,7 +46,7 @@ // order to create a Map. import Qt 4.7 -import org.webkit 1.0 +import QtWebKit 1.0 import "content/Mapping" Map { diff --git a/examples/declarative/modelviews/webview/inlinehtml.qml b/examples/declarative/modelviews/webview/inlinehtml.qml index 237bd8f..0448ff3 100644 --- a/examples/declarative/modelviews/webview/inlinehtml.qml +++ b/examples/declarative/modelviews/webview/inlinehtml.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import Qt 4.7 -import org.webkit 1.0 +import QtWebKit 1.0 // Inline HTML with loose formatting can be // set on the html property. diff --git a/examples/declarative/modelviews/webview/newwindows.qml b/examples/declarative/modelviews/webview/newwindows.qml index 4ea3e68..c09b2a9 100644 --- a/examples/declarative/modelviews/webview/newwindows.qml +++ b/examples/declarative/modelviews/webview/newwindows.qml @@ -44,7 +44,7 @@ // allow it on WebView with settings.javascriptCanOpenWindows: true import Qt 4.7 -import org.webkit 1.0 +import QtWebKit 1.0 Grid { columns: 3 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; } |