diff options
| author | Simon Hausmann <simon.hausmann@theqtcompany.com> | 2015-08-28 04:57:18 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-08-28 04:57:18 +0000 |
| commit | 7cf223c6db1fe3d2f4d58df955973426f69b58a8 (patch) | |
| tree | dc7bef6113c30c2e6dffa0b40280d950c4a4252c | |
| parent | 1faca908dddb90824d94bed6a1561f4f192328d3 (diff) | |
| parent | 4a1846acd122af58c601f9832ade4c4d8986e66a (diff) | |
| download | qtdeclarative-7cf223c6db1fe3d2f4d58df955973426f69b58a8.tar.gz qtdeclarative-7cf223c6db1fe3d2f4d58df955973426f69b58a8.tar.bz2 qtdeclarative-7cf223c6db1fe3d2f4d58df955973426f69b58a8.zip | |
Merge "Merge remote-tracking branch 'origin/5.5' into 5.6" into refs/staging/5.6
| -rw-r--r-- | examples/quick/demos/samegame/samegame.pro | 2 | ||||
| -rw-r--r-- | src/qml/types/qqmlobjectmodel.cpp | 2 | ||||
| -rw-r--r-- | src/quick/util/qquickpixmapcache.cpp | 7 | ||||
| -rw-r--r-- | tools/qml/main.cpp | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/examples/quick/demos/samegame/samegame.pro b/examples/quick/demos/samegame/samegame.pro index 51e6f0032..e041dd61d 100644 --- a/examples/quick/demos/samegame/samegame.pro +++ b/examples/quick/demos/samegame/samegame.pro @@ -7,4 +7,4 @@ RESOURCES += samegame.qrc target.path = $$[QT_INSTALL_EXAMPLES]/quick/demos/samegame INSTALLS += target -QTPLUGIN += qsqlite +!contains(sql-drivers, sqlite): QTPLUGIN += qsqlite diff --git a/src/qml/types/qqmlobjectmodel.cpp b/src/qml/types/qqmlobjectmodel.cpp index 0076c2695..4b64f2480 100644 --- a/src/qml/types/qqmlobjectmodel.cpp +++ b/src/qml/types/qqmlobjectmodel.cpp @@ -210,7 +210,7 @@ public: \inqmlmodule QtQuick \brief Defines a set of objects to be used as a model - The VisualItemModel type encapsulates contains the objects to be used + The VisualItemModel type contains the objects to be used as a model. This element is now primarily available as ObjectModel in the QtQml.Models module. diff --git a/src/quick/util/qquickpixmapcache.cpp b/src/quick/util/qquickpixmapcache.cpp index a77bfd17d..0b7b5ce9a 100644 --- a/src/quick/util/qquickpixmapcache.cpp +++ b/src/quick/util/qquickpixmapcache.cpp @@ -137,6 +137,7 @@ public: class Event : public QEvent { public: Event(ReadError, const QString &, const QSize &, AutoTransform, QQuickTextureFactory *factory); + ~Event(); ReadError error; QString errorString; @@ -331,6 +332,11 @@ QQuickPixmapReply::Event::Event(ReadError e, const QString &s, const QSize &iSiz { } +QQuickPixmapReply::Event::~Event() +{ + delete textureFactory; +} + QNetworkAccessManager *QQuickPixmapReader::networkAccessManager() { if (!accessManager) { @@ -1021,6 +1027,7 @@ bool QQuickPixmapReply::event(QEvent *event) data->pixmapStatus = (de->error == NoError) ? QQuickPixmap::Ready : QQuickPixmap::Error; if (data->pixmapStatus == QQuickPixmap::Ready) { data->textureFactory = de->textureFactory; + de->textureFactory = 0; data->implicitSize = de->implicitSize; data->appliedTransform = de->autoTransform; PIXMAP_PROFILE(pixmapLoadingFinished(data->url, diff --git a/tools/qml/main.cpp b/tools/qml/main.cpp index c2718de24..90d2a940a 100644 --- a/tools/qml/main.cpp +++ b/tools/qml/main.cpp @@ -238,7 +238,7 @@ void LoadWatcher::checkForWindow(QObject *o) } #else Q_UNUSED(o) -#endif // QT_GUI_LIB +#endif // QT_GUI_LIB && !QT_NO_OPENGL } #if defined(QT_GUI_LIB) && !defined(QT_NO_OPENGL) @@ -257,7 +257,7 @@ void LoadWatcher::onOpenGlContextCreated(QOpenGLContext *context) puts(output.constData()); context->doneCurrent(); } -#endif // QT_GUI_LIB +#endif // QT_GUI_LIB && !QT_NO_OPENGL void quietMessageHandler(QtMsgType type, const QMessageLogContext &ctxt, const QString &msg) { |