diff --git a/src/corelib/global/qlibraryinfo.cpp b/src/corelib/global/qlibraryinfo.cpp index 6ffaef8f7c9..e09d2c72e1f 100644 --- a/src/corelib/global/qlibraryinfo.cpp +++ b/src/corelib/global/qlibraryinfo.cpp @@ -537,7 +537,18 @@ QStringList QLibraryInfo::paths(LibraryPath p) return QLibraryInfoPrivate::paths(p); } +static bool keepQtBuildDefaults() +{ +#if QT_CONFIG(settings) + QSettings *config = QLibraryInfoPrivate::configuration(); + Q_ASSERT(config != nullptr); + return config->value("Config/MergeQtConf", false).toBool(); +#else + return false; +#endif +} +#if QT_CONFIG(settings) static QString normalizePath(QString ret) { qsizetype startIndex = 0; @@ -566,18 +577,6 @@ static QString normalizePath(QString ret) return QDir::fromNativeSeparators(ret); }; -static bool keepQtBuildDefaults() -{ -#if QT_CONFIG(settings) - QSettings *config = QLibraryInfoPrivate::configuration(); - Q_ASSERT(config != nullptr); - return config->value("Config/MergeQtConf", false).toBool(); -#else - return false; -#endif -} - -#if QT_CONFIG(settings) static QVariant libraryPathToValue(QLibraryInfo::LibraryPath loc) { QVariant value; diff --git a/tests/auto/corelib/global/CMakeLists.txt b/tests/auto/corelib/global/CMakeLists.txt index 6072a18e817..8adf9d74306 100644 --- a/tests/auto/corelib/global/CMakeLists.txt +++ b/tests/auto/corelib/global/CMakeLists.txt @@ -16,7 +16,9 @@ if(NOT INTEGRITY) add_subdirectory(qnativeinterface) endif() add_subdirectory(qrandomgenerator) -add_subdirectory(qlibraryinfo) +if (QT_FEATURE_settings) + add_subdirectory(qlibraryinfo) +endif() add_subdirectory(qlogging) add_subdirectory(qtendian) add_subdirectory(qglobalstatic) diff --git a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp index 0b6d6f339be..f0b02ae91d3 100644 --- a/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp +++ b/tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp @@ -3,8 +3,10 @@ #include +#if QT_CONFIG(http) #include #include +#endif #include #include