diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist index b3d743584..6301aaf79 100644 --- a/package/freebsd/pkg-plist +++ b/package/freebsd/pkg-plist @@ -38,7 +38,6 @@ include/katie/QtCore/QContiguousCache include/katie/QtCore/QContiguousCacheData include/katie/QtCore/QContiguousCacheTypedData include/katie/QtCore/QCoreApplication -include/katie/QtCore/QCryptographicHash include/katie/QtCore/QDataStream include/katie/QtCore/QDate include/katie/QtCore/QDateTime @@ -244,7 +243,6 @@ include/katie/QtCore/qcontainerfwd.h include/katie/QtCore/qcontiguouscache.h include/katie/QtCore/qcoreapplication.h include/katie/QtCore/qcoreevent.h -include/katie/QtCore/qcryptographichash.h include/katie/QtCore/qdatastream.h include/katie/QtCore/qdatetime.h include/katie/QtCore/qdebug.h @@ -1221,6 +1219,7 @@ include/katie/QtGui/qx11info_x11.h include/katie/QtNetwork/QAbstractNetworkCache include/katie/QtNetwork/QAbstractSocket include/katie/QtNetwork/QAuthenticator +include/katie/QtNetwork/QCryptographicHash include/katie/QtNetwork/QFtp include/katie/QtNetwork/QHostAddress include/katie/QtNetwork/QHostInfo @@ -1264,6 +1263,7 @@ include/katie/QtNetwork/QtNetwork include/katie/QtNetwork/qabstractnetworkcache.h include/katie/QtNetwork/qabstractsocket.h include/katie/QtNetwork/qauthenticator.h +include/katie/QtNetwork/qcryptographichash.h include/katie/QtNetwork/qftp.h include/katie/QtNetwork/qhostaddress.h include/katie/QtNetwork/qhostinfo.h diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 29407335d..65ca7618e 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -2,7 +2,6 @@ set(EXTRA_CORE_LIBS ${ZLIB_LIBRARIES} ${ICU_LIBRARIES} - ${OPENSSL_LIBRARIES} ${ZSTD_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} # libm should be present by default becaue this is C++ @@ -24,7 +23,6 @@ set(CORE_PUBLIC_HEADERS QAbstractFileEngine QTranslator QFuture - QCryptographicHash QWaitCondition QMimeData QtConcurrentMap @@ -119,7 +117,6 @@ include_directories( ${CMAKE_BINARY_DIR}/privateinclude/QtCore ${ZLIB_INCLUDE_DIRS} ${ICU_INCLUDES} - ${OPENSSL_INCLUDE_DIR} ${ZSTD_INCLUDES} ) @@ -260,7 +257,6 @@ set(CORE_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/tools/qcache.h ${CMAKE_CURRENT_SOURCE_DIR}/tools/qchar.h ${CMAKE_CURRENT_SOURCE_DIR}/tools/qcontainerfwd.h - ${CMAKE_CURRENT_SOURCE_DIR}/tools/qcryptographichash.h ${CMAKE_CURRENT_SOURCE_DIR}/tools/qdatetime.h ${CMAKE_CURRENT_SOURCE_DIR}/tools/qdatetime_p.h ${CMAKE_CURRENT_SOURCE_DIR}/tools/qeasingcurve.h @@ -401,7 +397,6 @@ set(CORE_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/tools/qbytearray.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tools/qbytearraymatcher.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tools/qchar.cpp - ${CMAKE_CURRENT_SOURCE_DIR}/tools/qcryptographichash.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tools/qdatetime.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tools/qeasingcurve.cpp ${CMAKE_CURRENT_SOURCE_DIR}/tools/qelapsedtimer.cpp diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 41e430972..a26e8ca3f 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -37,6 +37,7 @@ set(NETWORK_PUBLIC_HEADERS QUdpSocket QUrlInfo QHttpMultiPart + QCryptographicHash ) include_directories( @@ -97,6 +98,7 @@ set(NETWORK_HEADERS ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qsharednetworksession_p.h ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qauthenticator.h ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qauthenticator_p.h + ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qcryptographichash.h ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qhostaddress.h ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qhostaddress_p.h ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qhostinfo.h @@ -171,6 +173,7 @@ set(NETWORK_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qbearerplugin.cpp ${CMAKE_CURRENT_SOURCE_DIR}/bearer/qsharednetworksession.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qauthenticator.cpp + ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qcryptographichash.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qhostaddress.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qhostinfo.cpp ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qurlinfo.cpp diff --git a/src/core/tools/qcryptographichash.cpp b/src/network/kernel/qcryptographichash.cpp similarity index 100% rename from src/core/tools/qcryptographichash.cpp rename to src/network/kernel/qcryptographichash.cpp diff --git a/src/core/tools/qcryptographichash.h b/src/network/kernel/qcryptographichash.h similarity index 100% rename from src/core/tools/qcryptographichash.h rename to src/network/kernel/qcryptographichash.h