summaryrefslogtreecommitdiffstats
path: root/src/declarative
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative')
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp1
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsimagebase.cpp2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicsitem.cpp2
-rw-r--r--src/declarative/graphicsitems/qmlgraphicslistview_p.h1
-rw-r--r--src/declarative/graphicsitems/qmlgraphicspositioners_p.h2
-rw-r--r--src/declarative/qml/qmlmetatype.cpp4
-rw-r--r--src/declarative/util/qmlfontloader.cpp1
-rw-r--r--src/declarative/util/qmlpixmapcache.cpp1
-rw-r--r--src/declarative/util/qmlstate_p.h2
-rw-r--r--src/declarative/util/qmltransition_p.h2
10 files changed, 10 insertions, 8 deletions
diff --git a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
index 670b38b..e01e569 100644
--- a/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsanimatedimage.cpp
@@ -238,6 +238,7 @@ void QmlGraphicsAnimatedImage::setSource(const QUrl &url)
#endif
d->status = Loading;
QNetworkRequest req(d->url);
+ req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
d->reply = qmlEngine(this)->networkAccessManager()->get(req);
QObject::connect(d->reply, SIGNAL(finished()),
this, SLOT(movieRequestFinished()));
diff --git a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
index e3b98aa..08617ac 100644
--- a/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsimagebase.cpp
@@ -45,8 +45,6 @@
#include <qmlengine.h>
#include <qmlpixmapcache_p.h>
-#include <QNetworkRequest>
-#include <QNetworkReply>
#include <QFile>
QT_BEGIN_NAMESPACE
diff --git a/src/declarative/graphicsitems/qmlgraphicsitem.cpp b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
index aa73444..dd685d4 100644
--- a/src/declarative/graphicsitems/qmlgraphicsitem.cpp
+++ b/src/declarative/graphicsitems/qmlgraphicsitem.cpp
@@ -56,8 +56,6 @@
#include <QPen>
#include <QFile>
#include <QEvent>
-#include <QNetworkReply>
-#include <QNetworkRequest>
#include <QGraphicsSceneMouseEvent>
#include <QtScript/qscriptengine.h>
#include <QtGui/qgraphicstransform.h>
diff --git a/src/declarative/graphicsitems/qmlgraphicslistview_p.h b/src/declarative/graphicsitems/qmlgraphicslistview_p.h
index 2a2ef8a..79d678a 100644
--- a/src/declarative/graphicsitems/qmlgraphicslistview_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicslistview_p.h
@@ -202,7 +202,6 @@ Q_SIGNALS:
void orientationChanged();
void currentIndexChanged();
void currentSectionChanged();
- void sectionExpressionChanged();
void highlightMoveSpeedChanged();
void highlightResizeSpeedChanged();
void highlightChanged();
diff --git a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
index 0e6d134..d6711f6 100644
--- a/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
+++ b/src/declarative/graphicsitems/qmlgraphicspositioners_p.h
@@ -45,7 +45,7 @@
#include "qmlgraphicsitem.h"
#include "../util/qmlstate_p.h"
-#include "qpodvector_p.h"
+#include <private/qpodvector_p.h>
#include <QtCore/QObject>
#include <QtCore/QString>
diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp
index 0b79a21..d9c007d 100644
--- a/src/declarative/qml/qmlmetatype.cpp
+++ b/src/declarative/qml/qmlmetatype.cpp
@@ -1102,9 +1102,11 @@ bool QmlMetaType::copy(int type, void *data, const void *copy)
case QMetaType::QBitmap:
*static_cast<NS(QBitmap) *>(data) = *static_cast<const NS(QBitmap)*>(copy);
return true;
+#ifndef QT_NO_CURSOR
case QMetaType::QCursor:
*static_cast<NS(QCursor) *>(data) = *static_cast<const NS(QCursor)*>(copy);
return true;
+#endif
case QMetaType::QSizePolicy:
*static_cast<NS(QSizePolicy) *>(data) = *static_cast<const NS(QSizePolicy)*>(copy);
return true;
@@ -1308,9 +1310,11 @@ bool QmlMetaType::copy(int type, void *data, const void *copy)
case QMetaType::QBitmap:
*static_cast<NS(QBitmap) *>(data) = NS(QBitmap)();
return true;
+#ifndef QT_NO_CURSOR
case QMetaType::QCursor:
*static_cast<NS(QCursor) *>(data) = NS(QCursor)();
return true;
+#endif
case QMetaType::QSizePolicy:
*static_cast<NS(QSizePolicy) *>(data) = NS(QSizePolicy)();
return true;
diff --git a/src/declarative/util/qmlfontloader.cpp b/src/declarative/util/qmlfontloader.cpp
index 8230b1a..42b34b5 100644
--- a/src/declarative/util/qmlfontloader.cpp
+++ b/src/declarative/util/qmlfontloader.cpp
@@ -134,6 +134,7 @@ void QmlFontLoader::setSource(const QUrl &url)
#endif
{
QNetworkRequest req(d->url);
+ req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
d->reply = qmlEngine(this)->networkAccessManager()->get(req);
QObject::connect(d->reply, SIGNAL(finished()), this, SLOT(replyFinished()));
}
diff --git a/src/declarative/util/qmlpixmapcache.cpp b/src/declarative/util/qmlpixmapcache.cpp
index 3307ff8..6f36cad 100644
--- a/src/declarative/util/qmlpixmapcache.cpp
+++ b/src/declarative/util/qmlpixmapcache.cpp
@@ -404,6 +404,7 @@ QmlPixmapReply *QmlPixmapCache::request(QmlEngine *engine, const QUrl &url)
QmlPixmapReplyHash::Iterator iter = qmlActivePixmapReplies.find(key);
if (iter == qmlActivePixmapReplies.end()) {
QNetworkRequest req(url);
+ req.setAttribute(QNetworkRequest::HttpPipeliningAllowedAttribute, true);
QmlPixmapReply *item = new QmlPixmapReply(key, engine->networkAccessManager()->get(req));
iter = qmlActivePixmapReplies.insert(key, item);
} else {
diff --git a/src/declarative/util/qmlstate_p.h b/src/declarative/util/qmlstate_p.h
index 95a6fc5..fdac847 100644
--- a/src/declarative/util/qmlstate_p.h
+++ b/src/declarative/util/qmlstate_p.h
@@ -133,7 +133,7 @@ class Q_DECLARATIVE_EXPORT QmlState : public QObject
Q_PROPERTY(QString extend READ extends WRITE setExtends)
Q_PROPERTY(QmlList<QmlStateOperation *>* changes READ changes)
Q_CLASSINFO("DefaultProperty", "changes")
- Q_CLASSINFO("DeferredPropertyNames", "changes");
+ Q_CLASSINFO("DeferredPropertyNames", "changes")
public:
QmlState(QObject *parent=0);
diff --git a/src/declarative/util/qmltransition_p.h b/src/declarative/util/qmltransition_p.h
index 0a9b036..c1a6f66 100644
--- a/src/declarative/util/qmltransition_p.h
+++ b/src/declarative/util/qmltransition_p.h
@@ -67,7 +67,7 @@ class Q_DECLARATIVE_EXPORT QmlTransition : public QObject
Q_PROPERTY(bool reversible READ reversible WRITE setReversible)
Q_PROPERTY(QmlList<QmlAbstractAnimation *>* animations READ animations)
Q_CLASSINFO("DefaultProperty", "animations")
- Q_CLASSINFO("DeferredPropertyNames", "animations");
+ Q_CLASSINFO("DeferredPropertyNames", "animations")
public:
QmlTransition(QObject *parent=0);