diff options
| author | Daiwei Li <daiweili@suitabletech.com> | 2015-09-15 20:06:08 -0700 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-03-17 19:25:43 +0000 |
| commit | dfb6850b916271333d2bf1b244f5f3dc8a89fcb1 (patch) | |
| tree | 1d49f378ce3476cd4c6c9da6fb44d09fcc8be647 /src/network | |
| parent | e9a7739e77f79baeb5452189b6d17e63de5b341d (diff) | |
Android: Bearer jar shouldn't be a dependency if disabled
Task-number: QTBUG-59264
Change-Id: I960d5bff902b06ca5dda447fd60002a756a11e51
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/network.pro | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/src/network/network.pro b/src/network/network.pro index 75105bd681..98fbf82275 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -22,16 +22,18 @@ include(ssl/ssl.pri) QMAKE_LIBS += $$QMAKE_LIBS_NETWORK -ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroidBearer-bundled.jar -ANDROID_JAR_DEPENDENCIES = \ - jar/QtAndroidBearer.jar -ANDROID_LIB_DEPENDENCIES = \ - plugins/bearer/libqandroidbearer.so -MODULE_PLUGIN_TYPES = \ - bearer -ANDROID_PERMISSIONS += \ - android.permission.ACCESS_NETWORK_STATE +qtConfig(bearermanagement) { + ANDROID_BUNDLED_JAR_DEPENDENCIES = \ + jar/QtAndroidBearer-bundled.jar + ANDROID_JAR_DEPENDENCIES = \ + jar/QtAndroidBearer.jar + ANDROID_LIB_DEPENDENCIES = \ + plugins/bearer/libqandroidbearer.so + MODULE_PLUGIN_TYPES = \ + bearer + ANDROID_PERMISSIONS += \ + android.permission.ACCESS_NETWORK_STATE +} MODULE_WINRT_CAPABILITIES = \ internetClient \ |