aboutsummaryrefslogtreecommitdiffstats
path: root/src/declarative/util
diff options
context:
space:
mode:
Diffstat (limited to 'src/declarative/util')
-rw-r--r--src/declarative/util/qdeclarativepixmapcache.cpp4
-rw-r--r--src/declarative/util/util.pri2
2 files changed, 4 insertions, 2 deletions
diff --git a/src/declarative/util/qdeclarativepixmapcache.cpp b/src/declarative/util/qdeclarativepixmapcache.cpp
index dcce7db813..f0e999b46e 100644
--- a/src/declarative/util/qdeclarativepixmapcache.cpp
+++ b/src/declarative/util/qdeclarativepixmapcache.cpp
@@ -289,7 +289,7 @@ void QDeclarativePixmapReply::postReply(ReadError error, const QString &errorStr
}
QDeclarativePixmapReply::Event::Event(ReadError e, const QString &s, const QSize &iSize, const QImage &i)
- : QEvent(QEvent::User), error(e), errorString(s), implicitSize(iSize), image(i)
+ : QEvent(QEvent::User), error(e), errorString(s), implicitSize(iSize), image(i), texture(0), context(0)
{
}
@@ -793,7 +793,7 @@ bool QDeclarativePixmapReply::event(QEvent *event)
if (data) {
Event *de = static_cast<Event *>(event);
data->pixmapStatus = (de->error == NoError) ? QDeclarativePixmap::Ready : QDeclarativePixmap::Error;
-
+
if (data->pixmapStatus == QDeclarativePixmap::Ready) {
if (de->texture) {
data->texture = de->texture;
diff --git a/src/declarative/util/util.pri b/src/declarative/util/util.pri
index 62fa8f1664..5bc8b117c0 100644
--- a/src/declarative/util/util.pri
+++ b/src/declarative/util/util.pri
@@ -69,4 +69,6 @@ contains(QT_CONFIG, xmlpatterns) {
QT+=xmlpatterns
SOURCES += $$PWD/qdeclarativexmllistmodel.cpp
HEADERS += $$PWD/qdeclarativexmllistmodel_p.h
+} else {
+ DEFINES += QT_NO_XMLPATTERNS
}