feat: kirigami builds (QML gate cleared)
- QNetworkReply stub header for Redox cross-build - GuiPrivate + Network in find_package - QElapsedTimer include fix - networkAccessManager null stub in icon.cpp - Primitives target links Qt6::Network for headers
This commit is contained in:
@@ -22,6 +22,15 @@
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QElapsedTimer>
|
||||
#include <QQmlComponent>
|
||||
#include <QTimer>
|
||||
|
||||
|
||||
@@ -46,7 +46,7 @@ set_target_properties(KirigamiPrimitives PROPERTIES
|
||||
|
||||
target_include_directories(KirigamiPrimitives PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/..)
|
||||
|
||||
target_link_libraries(KirigamiPrimitives PRIVATE Qt6::Quick KirigamiPlatform)
|
||||
target_link_libraries(KirigamiPrimitives PRIVATE Qt6::Quick Qt6::Network KirigamiPlatform)
|
||||
|
||||
if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
|
||||
set(_extra_options DEBUGINFO)
|
||||
|
||||
@@ -513,7 +513,7 @@ QImage Icon::findIcon(const QSize &size)
|
||||
const auto url = m_source.toUrl();
|
||||
QQmlEngine *engine = qmlEngine(this);
|
||||
QNetworkAccessManager *qnam;
|
||||
if (engine && (qnam = engine->networkAccessManager()) && (!m_networkReply || m_networkReply->url() != url)) {
|
||||
if (engine && (qnam = nullptr /* Redox: networkAccessManager not available */) && (!m_networkReply || m_networkReply->url() != url)) {
|
||||
QNetworkRequest request(url);
|
||||
request.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache);
|
||||
m_networkReply = qnam->get(request);
|
||||
|
||||
Reference in New Issue
Block a user