Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-02-09 11:18:39 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix ifdefs with UrlTools

Browse Source
This commit is contained in:
varjolintu 2023-12-11 19:54:58 +02:00 committed by Jonathan White
parent f7fd3881e3
commit c5e9d3588a
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/UrlTools.cpp
View File

@ -16,7 +16,7 @@
*/ */
#include "UrlTools.h" #include "UrlTools.h"
#ifdef WITH_XC_NETWORKING #if defined(WITH_XC_NETWORKING) || defined(WITH_XC_BROWSER)
#include <QHostAddress> #include <QHostAddress>
#include <QNetworkCookie> #include <QNetworkCookie>
#include <QNetworkCookieJar> #include <QNetworkCookieJar>
@ -40,7 +40,7 @@ QUrl UrlTools::convertVariantToUrl(const QVariant& var) const
return url; return url;
} }
#ifdef WITH_XC_NETWORKING #if defined(WITH_XC_NETWORKING) || defined(WITH_XC_BROWSER)
QUrl UrlTools::getRedirectTarget(QNetworkReply* reply) const QUrl UrlTools::getRedirectTarget(QNetworkReply* reply) const
{ {
QVariant var = reply->attribute(QNetworkRequest::RedirectionTargetAttribute); QVariant var = reply->attribute(QNetworkRequest::RedirectionTargetAttribute);

2
src/core/UrlTools.h
View File

@ -32,7 +32,7 @@ public:
explicit UrlTools() = default; explicit UrlTools() = default;
static UrlTools* instance(); static UrlTools* instance();
#ifdef WITH_XC_NETWORKING #if defined(WITH_XC_NETWORKING) || defined(WITH_XC_BROWSER)
QUrl getRedirectTarget(QNetworkReply* reply) const; QUrl getRedirectTarget(QNetworkReply* reply) const;
QString getBaseDomainFromUrl(const QString& url) const; QString getBaseDomainFromUrl(const QString& url) const;
QString getTopLevelDomainFromUrl(const QString& url) const; QString getTopLevelDomainFromUrl(const QString& url) const;

6
tests/CMakeLists.txt
View File

@ -150,8 +150,6 @@ if(WITH_XC_NETWORKING)
LIBS ${TEST_LIBRARIES}) LIBS ${TEST_LIBRARIES})
add_unit_test(NAME testicondownloader SOURCES TestIconDownloader.cpp LIBS ${TEST_LIBRARIES}) add_unit_test(NAME testicondownloader SOURCES TestIconDownloader.cpp LIBS ${TEST_LIBRARIES})
add_unit_test(NAME testurltools SOURCES TestUrlTools.cpp LIBS ${TEST_LIBRARIES})
endif() endif()
if(WITH_XC_AUTOTYPE) if(WITH_XC_AUTOTYPE)
@ -246,6 +244,10 @@ if(WITH_XC_BROWSER)
endif() endif()
endif() endif()
if(WITH_XC_NETWORKING OR WITH_XC_BROWSER)
add_unit_test(NAME testurltools SOURCES TestUrlTools.cpp LIBS ${TEST_LIBRARIES})
endif()
add_unit_test(NAME testcli SOURCES TestCli.cpp add_unit_test(NAME testcli SOURCES TestCli.cpp
LIBS testsupport cli ${TEST_LIBRARIES}) LIBS testsupport cli ${TEST_LIBRARIES})
target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>") target_compile_definitions(testcli PRIVATE KEEPASSX_CLI_PATH="$<TARGET_FILE:keepassxc-cli>")