Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: ensure Qt resources are properly loaded #2500

Merged
merged 3 commits into from
Dec 23, 2024
Merged

fix: ensure Qt resources are properly loaded #2500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d4db434
fix: ensure Qt resources are properly loaded
Johnson-zs Dec 14, 2024
ab82aa0
fix: [desktop] crash in some case.
Johnson-zs Dec 20, 2024
77c1c5c
chore: update version to 6.5.10.2
Johnson-zs Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions debian/changelog
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
dde-file-manager (6.5.10.2) unstable; urgency=medium

* fix bugs

-- Zhang Sheng <[email protected]> Mon, 23 Dec 2024 17:10:08 +0800

dde-file-manager (6.5.10.1) unstable; urgency=medium

* update to 6.5.10.1
Expand Down
4 changes: 3 additions & 1 deletion src/plugins/desktop/ddplugin-organizer/ddplugin-organizer.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
# qt_add_resources works only if you have previously used find_package to find the Qt
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core)

# 指定资源文件
set(QRC_FILE
resources/images.qrc
Expand All @@ -15,7 +18,6 @@ add_library(${BIN_NAME}
${QRC_RESOURCES}
)

find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core)
set_target_properties(${BIN_NAME} PROPERTIES
LIBRARY_OUTPUT_DIRECTORY ${DFM_BUILD_PLUGIN_DESKTOP_DIR})

Expand Down
4 changes: 4 additions & 0 deletions src/plugins/desktop/ddplugin-organizer/mode/normalizedmode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,6 +224,10 @@ void NormalizedModePrivate::connectCollectionSignals(CollectionHolderPointer col
});
dpfSignalDispatcher->subscribe("ddplugin_background", "signal_Background_BackgroundSetted",
collection->widget(), &CollectionWidget::cacheSnapshot);
connect(collection->widget(), &QWidget::destroyed, this, [](QObject *obj) {
dpfSignalDispatcher->unsubscribe("ddplugin_background", "signal_Background_BackgroundSetted",
obj, &CollectionWidget::cacheSnapshot);
});
}
}

Expand Down
Loading