diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-08-15 10:35:53 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-10-10 14:11:47 +0000 |
| commit | 4ee2bc4e9c05d8daec8b04412a0b7c0264fbc1a4 (patch) | |
| tree | 03b0dd07b6b087b5bdaded499961ee1492d408ae /src/quick/items/qquickborderimage.cpp | |
| parent | 11e0e5574a529e337e43ab15fca357b109ea2834 (diff) | |
Turn the no-network support into a configurable feature
Change-Id: Ic70f60c124fe166b37fbe9b853735be3c5e0d46d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/quick/items/qquickborderimage.cpp')
| -rw-r--r-- | src/quick/items/qquickborderimage.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index ca5ad8dbbd..2fb151b36f 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.cpp @@ -43,7 +43,7 @@ #include <QtQml/qqmlinfo.h> #include <QtQml/qqmlfile.h> #include <QtQml/qqmlengine.h> -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) #include <QtNetwork/qnetworkreply.h> #endif #include <QtCore/qfile.h> @@ -171,7 +171,7 @@ QQuickBorderImage::QQuickBorderImage(QQuickItem *parent) QQuickBorderImage::~QQuickBorderImage() { -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) Q_D(QQuickBorderImage); if (d->sciReply) d->sciReply->deleteLater(); @@ -274,7 +274,7 @@ void QQuickBorderImage::setSource(const QUrl &url) if (url == d->url) return; -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) if (d->sciReply) { d->sciReply->deleteLater(); d->sciReply = 0; @@ -317,7 +317,7 @@ void QQuickBorderImage::load() setGridScaledImage(QQuickGridScaledImage(&file)); return; } else { -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) if (d->progress != 0.0) { d->progress = 0.0; emit progressChanged(d->progress); @@ -537,7 +537,7 @@ void QQuickBorderImage::requestFinished() pixmapChange(); } -#ifndef QT_NO_NETWORK +#if QT_CONFIG(qml_network) #define BORDERIMAGE_MAX_REDIRECT 16 void QQuickBorderImage::sciRequestFinished() @@ -567,7 +567,7 @@ void QQuickBorderImage::sciRequestFinished() setGridScaledImage(sci); } } -#endif // QT_NO_NETWORK +#endif // qml_network void QQuickBorderImage::doUpdate() { |