diff options
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 | ||||
| -rw-r--r-- | configure.cmake | 2 | ||||
| -rw-r--r-- | configure.json | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 6bd5e76cd6..529b83ff73 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -72,7 +72,7 @@ function(qt_build_internals_disable_pkg_config_if_needed) set(pkg_config_enabled ON) qt_build_internals_find_pkg_config_executable() - if(APPLE OR WIN32 OR QNX OR (NOT PKG_CONFIG_EXECUTABLE)) + if(APPLE OR WIN32 OR QNX OR ANDROID OR (NOT PKG_CONFIG_EXECUTABLE)) set(pkg_config_enabled OFF) endif() diff --git a/configure.cmake b/configure.cmake index 97eb0c7aa7..1ee218646b 100644 --- a/configure.cmake +++ b/configure.cmake @@ -433,7 +433,7 @@ qt_feature("optimize_size" qt_feature_config("optimize_size" QMAKE_PRIVATE_CONFIG) qt_feature("pkg-config" PUBLIC LABEL "Using pkg-config" - AUTODETECT NOT APPLE AND NOT WIN32 + AUTODETECT NOT APPLE AND NOT WIN32 AND NOT ANDROID CONDITION PKG_CONFIG_FOUND ) qt_feature_config("pkg-config" QMAKE_PUBLIC_QT_CONFIG diff --git a/configure.json b/configure.json index 4b339cf2ae..29afbac43d 100644 --- a/configure.json +++ b/configure.json @@ -753,7 +753,7 @@ }, "pkg-config": { "label": "Using pkg-config", - "autoDetect": "!config.darwin && !config.win32", + "autoDetect": "!config.darwin && !config.win32 && !config.android", "condition": "tests.pkg-config", "output": [ "publicFeature", |