diff options
author | Oliver Wolff <oliver.wolff@digia.com> | 2014-03-10 13:03:01 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-03-12 12:40:01 +0100 |
commit | 9cc72b43e09c5abd94bb8d13e5b3fbe4d674a726 (patch) | |
tree | 3d23268a5bf974123a7f9c528310126767eeb87a /examples | |
parent | ce56dbcdb420b62e085fed74df248fdecbdad871 (diff) |
networkaccessmanagerfactory example: Fixed build with QT_NO_NETWORKPROXY
Change-Id: I803dd555961420b8189f36e1978a3fb65ab4d2a0
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Andrew Knight <andrew.knight@digia.com>
Diffstat (limited to 'examples')
-rw-r--r-- | examples/qml/networkaccessmanagerfactory/main.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/examples/qml/networkaccessmanagerfactory/main.cpp b/examples/qml/networkaccessmanagerfactory/main.cpp index 9fe8882243..c8c2b7bf1a 100644 --- a/examples/qml/networkaccessmanagerfactory/main.cpp +++ b/examples/qml/networkaccessmanagerfactory/main.cpp @@ -56,8 +56,10 @@ networkaccessmanagerfactory [-host <proxy> -port <port>] [file] */ +#ifndef QT_NO_NETWORKPROXY static QString proxyHost; static int proxyPort = 0; +#endif // !QT_NO_NETWORKPROXY class MyNetworkAccessManagerFactory : public QQmlNetworkAccessManagerFactory { @@ -68,11 +70,13 @@ public: QNetworkAccessManager *MyNetworkAccessManagerFactory::create(QObject *parent) { QNetworkAccessManager *nam = new QNetworkAccessManager(parent); +#ifndef QT_NO_NETWORKPROXY if (!proxyHost.isEmpty()) { qDebug() << "Created QNetworkAccessManager using proxy" << (proxyHost + ":" + QString::number(proxyPort)); QNetworkProxy proxy(QNetworkProxy::HttpCachingProxy, proxyHost, proxyPort); nam->setProxy(proxy); } +#endif // !QT_NO_NETWORKPROXY return nam; } @@ -84,10 +88,12 @@ int main(int argc, char ** argv) QGuiApplication app(argc, argv); QCommandLineParser parser; +#ifndef QT_NO_NETWORKPROXY QCommandLineOption proxyHostOption("host", "The proxy host to use.", "host"); parser.addOption(proxyHostOption); QCommandLineOption proxyPortOption("port", "The proxy port to use.", "port", "0"); parser.addOption(proxyPortOption); +#endif // !QT_NO_NETWORKPROXY parser.addPositionalArgument("file", "The file to use."); QCommandLineOption helpOption = parser.addHelpOption(); parser.setSingleDashWordOptionMode(QCommandLineParser::ParseAsLongOptions); @@ -100,6 +106,7 @@ int main(int argc, char ** argv) qWarning() << parser.helpText(); exit(0); } +#ifndef QT_NO_NETWORKPROXY if (parser.isSet(proxyHostOption)) proxyHost = parser.value(proxyHostOption); if (parser.isSet(proxyPortOption)) { @@ -111,6 +118,7 @@ int main(int argc, char ** argv) exit(1); } } +#endif // !QT_NO_NETWORKPROXY if (parser.positionalArguments().count() == 1) source = QUrl::fromLocalFile(parser.positionalArguments().first()); |