Qt6.8 #2541
Merged
Qt6.8 #2541
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit includes the following changes: 1. Migrate preview plugins from Qt5 to Qt6 2. Standardize plugin names with "deepin-" prefix 3. Update CMake configurations for preview plugins 4. Fix build paths and output directories 5. Remove deprecated Qt APIs and update to new ones 6. Remove dde-desktop related files as it's now a plugin of dde-shell Key changes: - Update Qt dependencies from Qt5 to Qt6 - Update DTK dependencies to Dtk6 - Fix preview plugin paths and configurations - Clean up obsolete desktop-related code and files - Fix some Qt6 compatibility issues in preview plugins Log: Qt6
This commit updates the project to be compatible with Qt6 by making the following changes: 1. Replaced all instances of `find_package(Qt5 COMPONENTS ...)` with `find_package(Qt6 COMPONENTS ...)` in CMakeLists.txt files. 2. Updated target link libraries from `DFM::base` and `DFM::framework` to `DFM6::base` and `DFM6::framework`. 3. Adjusted Dtk library references to use `Dtk6` instead of the previous version. 4. Ensured that all applications and tools are now configured to build with Qt6. These changes are essential for maintaining compatibility with the latest Qt framework and ensuring the project can leverage new features and improvements in Qt6. Log:
This commit refactors the dde-file-dialog application and its associated plugins by implementing the following changes: 1. Updated plugin names in `main.cpp` files for `dde-file-dialog`, `dde-file-dialog-wayland`, and `dde-file-dialog-x11` applications to ensure consistency. 2. Modified `CMakeLists.txt` in the filedialog plugin to change the subdirectory name from `filedialogplugin-core` to `core`. 3. Refactored the `cleanFilterList` method calls in the `FileDialogPrivate` class to use the method directly instead of through `QPlatformFileDialogHelper`. 4. Added a new `cleanFilterList` method to the `FileDialogPrivate` class to clean the filter list using regular expressions. Log: These changes simplify the plugin structure, improve code maintainability, and remove obsolete components.
- Removed Qt5 support and related build files, focusing solely on Qt6 - Unified plugin interface IDs by removing Qt version-specific suffixes - Consolidated CMake build files to remove duplicate Qt5/Qt6 configurations - Updated library dependencies to use Qt6 and DFM6 components - Fixed Qt6 compatibility issues in various plugins: * Updated deprecated Qt APIs (QTime -> QElapsedTimer) * Fixed palette color usage for Qt6 * Updated QDateTime handling * Modified container operations for Qt6 style * Updated SVG widget includes for Qt6 * Fixed QFileDialog mode constants This commit streamlines the codebase by removing Qt5 support and standardizing on Qt6, while improving maintainability by eliminating duplicate build configurations. Log: Qt6
- Removed Qt5 build configurations and related files - Simplified CMake build system by removing Qt version checks - Updated QVariant usage for Qt6 compatibility (QVariant::Type -> QMetaType) - Fixed Qt6 specific API changes: * Updated DBus interface generation * Fixed icon painting method for Qt6 * Updated string split behavior * Removed deprecated Qt::AA_UseHighDpiPixmaps - Consolidated build files and removed duplicate configurations - Updated package installation paths to use Qt6-specific names Log:
- Updated plugin library names to follow consistent naming pattern: * Changed libdfmplugin-core.so to libdfm-core-plugin.so * Updated all plugin library names to use dfm-*-plugin format - Separated PROJECT_NAME and BIN_NAME in CMake files: * PROJECT_NAME remains as dfmplugin-* * BIN_NAME set to dfm-*-plugin for output libraries - Updated references in main applications to use new library names - Maintained same installation paths and dependencies Log: This change improves consistency in plugin naming across the project.
It cause crash after Qt6 Log:
|
Warning
详情 {
"unset": {
"src/apps/dde-desktop/main.cpp": {
"a": [
" qunsetenv(envName);"
]
}
}
} |
|
Note
详情{
"src/apps/dde-file-manager/main.cpp": [
{
"line": " a.setApplicationAcknowledgementPage(\"https://www.deepin.org/acknowledgments/\" + qApp->applicationName());",
"line_number": 296,
"rule": "S35",
"reason": "Url link | e56e98a089"
}
],
"src/plugins/filedialog/core/core.json": [
{
"line": " \"UrlLink\" : \"https://www.uniontech.com\",",
"line_number": 11,
"rule": "S35",
"reason": "Url link | 3c9a9fccb6"
}
],
"src/plugins/daemon/vault/vaultcontrol.cpp": [
{
"line": " const QString &passwd = passwordFromKeyring();",
"line_number": 101,
"rule": "S28",
"reason": "Suspicious password declaration | bbb03f3741"
}
],
"debian/control": [
{
"line": "Homepage: http://www.deepin.org",
"line_number": 69,
"rule": "S35",
"reason": "Url link | 6fe814dfb7"
}
]
} |
max-lvs
approved these changes
Jan 7, 2025
|
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: Johnson-zs, max-lvs The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/forcemerge |
|
This pr force merged! (status: blocked) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.