1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation issues when configuration features are disabled

Browse Source 
Commit fixes settings and http features

Task-number: QTBUG-122999
Change-Id: Iff94e9e4f7122a35000376e59cdea2a93e6a7f40
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit ba672abfaed6fa8adde44b32c7f43c91630b5eeb)
This commit is contained in:
Jari Helaakoski 2024-05-27 13:14:46 +03:00
parent bea866c2a1
commit 313392ec6b
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/corelib/global/qlibraryinfo.cpp
View File

@ -537,7 +537,18 @@ QStringList QLibraryInfo::paths(LibraryPath p)
return QLibraryInfoPrivate::paths(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) static QString normalizePath(QString ret)
{ {
qsizetype startIndex = 0; qsizetype startIndex = 0;
@ -566,18 +577,6 @@ static QString normalizePath(QString ret)
return QDir::fromNativeSeparators(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) static QVariant libraryPathToValue(QLibraryInfo::LibraryPath loc)
{ {
QVariant value; QVariant value;

4
tests/auto/corelib/global/CMakeLists.txt
View File

@ -16,7 +16,9 @@ if(NOT INTEGRITY)
add_subdirectory(qnativeinterface) add_subdirectory(qnativeinterface)
endif() endif()
add_subdirectory(qrandomgenerator) add_subdirectory(qrandomgenerator)
add_subdirectory(qlibraryinfo) if (QT_FEATURE_settings)
add_subdirectory(qlibraryinfo)
endif()
add_subdirectory(qlogging) add_subdirectory(qlogging)
add_subdirectory(qtendian) add_subdirectory(qtendian)
add_subdirectory(qglobalstatic) add_subdirectory(qglobalstatic)

2
tests/auto/network/access/qnetworkrequest/tst_qnetworkrequest.cpp
View File

@ -3,8 +3,10 @@
#include <QTest> #include <QTest>
#if QT_CONFIG(http)
#include <QtNetwork/QHttp1Configuration> #include <QtNetwork/QHttp1Configuration>
#include <QtNetwork/QHttp2Configuration> #include <QtNetwork/QHttp2Configuration>
#endif
#include <QtNetwork/QNetworkRequest> #include <QtNetwork/QNetworkRequest>
#include <QtNetwork/QNetworkCookie> #include <QtNetwork/QNetworkCookie>