spark-store-project/spark-store
15
0
Fork 0
mirror of https://gitee.com/spark-store-project/spark-store synced 2026-03-25 14:59:44 +08:00
Code Issues 1 Packages Projects Releases Wiki Activity

fix(Qt6): FTBFS with Qt 6

Browse Source 
1. QMake project file should use dtk6 when build with Qt 6
2. FollowRedirects attr for QNetworkRequest is on by default on Qt 6
3. QLabel::pixmap() always return a QPixmap instead of a const pointer
This commit is contained in:
Wang Zichong
2026-01-15 13:27:52 +08:00
parent 5a790abb27
commit 14d7d26d0a
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/pages/appintopage.cpp
View File

@@ -73,8 +73,9 @@ void AppIntoPage::openUrl(const QUrl &url)
iconRequest.setUrl(QUrl(pkgUrlBase + "/icon.png")); iconRequest.setUrl(QUrl(pkgUrlBase + "/icon.png"));
iconRequest.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent); iconRequest.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
iconRequest.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); iconRequest.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
iconRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); iconRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
iconManager->get(iconRequest); iconManager->get(iconRequest);
QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) QObject::connect(iconManager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)
@@ -97,7 +98,9 @@ void AppIntoPage::openUrl(const QUrl &url)
QNetworkAccessManager *manager = new QNetworkAccessManager(this); QNetworkAccessManager *manager = new QNetworkAccessManager(this);
request.setUrl(QUrl(imgUrl)); request.setUrl(QUrl(imgUrl));
request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent); request.setHeader(QNetworkRequest::UserAgentHeader, m_userAgent);
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); request.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
#endif // QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'"); request.setHeader(QNetworkRequest::ContentTypeHeader, "charset='utf-8'");
manager->get(request); manager->get(request);
QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply) QObject::connect(manager, &QNetworkAccessManager::finished, [=](QNetworkReply *reply)

3
src/spark-store.pro
View File

@@ -31,7 +31,8 @@ DEFINES += APP_BRANCH=\\\"'$$system(git symbolic-ref --short -q HEAD)'\\\"
# We want to capture all logs (INFO, DEBUG, WARNING, ERROR) for export to /tmp/spark-store # We want to capture all logs (INFO, DEBUG, WARNING, ERROR) for export to /tmp/spark-store
CONFIG += c++11 link_pkgconfig CONFIG += c++11 link_pkgconfig
PKGCONFIG += dtkcore dtkgui dtkwidget equals(QT_MAJOR_VERSION, 6): PKGCONFIG += dtk6core dtk6gui dtk6widget
equals(QT_MAJOR_VERSION, 5): PKGCONFIG += dtkcore dtkgui dtkwidget
SOURCES += \ SOURCES += \
backend/DataCollectorAndUploader.cpp \ backend/DataCollectorAndUploader.cpp \

3
src/widgets/common/customlabel.cpp
View File

@@ -10,8 +10,7 @@ CustomLabel::CustomLabel(QWidget *parent,
QPixmap CustomLabel::pixmap() const QPixmap CustomLabel::pixmap() const
{ {
const QPixmap* p = QLabel::pixmap(); return QLabel::pixmap();
return p ? *p : QPixmap();
} }
void CustomLabel::setPixmap(const QPixmap &pixmap) void CustomLabel::setPixmap(const QPixmap &pixmap)