diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-18 08:33:26 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-18 08:33:26 +0200 |
commit | f04c2c40fd7ee91e5cbff2ca4df0fdc30dfbbcd5 (patch) | |
tree | 4e96d097987deb8d4d1a963e911dcbd1641a8502 /src/quick/util/qquickfontloader.cpp | |
parent | 0da811cdfebdae1d96c99fe681e6a776e73d2f7f (diff) | |
parent | e76ed6a2655894bd671ee7397a15f2e57cfc8d33 (diff) |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/qml/jsruntime/qv4variantobject.cpp
src/qml/types/qquickworkerscript.cpp
src/quick/scenegraph/util/qsgdefaultpainternode_p.h
tools/qmljs/qmljs.cpp
Change-Id: I876242714ec8c046238d8fd673a5ace2455b2b59
Diffstat (limited to 'src/quick/util/qquickfontloader.cpp')
-rw-r--r-- | src/quick/util/qquickfontloader.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/quick/util/qquickfontloader.cpp b/src/quick/util/qquickfontloader.cpp index 6e23d99f7e..d13291c30a 100644 --- a/src/quick/util/qquickfontloader.cpp +++ b/src/quick/util/qquickfontloader.cpp @@ -52,7 +52,7 @@ #include <qqmlinfo.h> #include <qqmlfile.h> -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) #include <QNetworkRequest> #include <QNetworkReply> #endif @@ -70,7 +70,7 @@ Q_OBJECT public: explicit QQuickFontObject(int _id = -1); -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) void download(const QUrl &url, QNetworkAccessManager *manager); Q_SIGNALS: @@ -82,7 +82,7 @@ private: private Q_SLOTS: void replyFinished(); -#endif // QT_NO_NETWORK +#endif // qml_network public: int id; @@ -92,7 +92,7 @@ public: QQuickFontObject::QQuickFontObject(int _id) : QObject(0) -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) ,redirectCount(0), reply(0) #endif ,id(_id) @@ -100,7 +100,7 @@ QQuickFontObject::QQuickFontObject(int _id) } -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) void QQuickFontObject::download(const QUrl &url, QNetworkAccessManager *manager) { QNetworkRequest req(url); @@ -141,7 +141,7 @@ void QQuickFontObject::replyFinished() reply = 0; } } -#endif // QT_NO_NETWORK +#endif // qml_network class QQuickFontLoaderPrivate : public QObjectPrivate { @@ -268,7 +268,7 @@ void QQuickFontLoader::setSource(const QUrl &url) } } else { if (!fontLoaderFonts()->map.contains(d->url)) { -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) QQuickFontObject *fo = new QQuickFontObject; fontLoaderFonts()->map[d->url] = fo; fo->download(d->url, qmlEngine(this)->networkAccessManager()); @@ -282,7 +282,7 @@ void QQuickFontLoader::setSource(const QUrl &url) } else { QQuickFontObject *fo = fontLoaderFonts()->map.value(d->url); if (fo->id == -1) { -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) d->status = Loading; emit statusChanged(); QObject::connect(fo, SIGNAL(fontDownloaded(QString,QQuickFontLoader::Status)), |