From 3c6759e5849df0978438402d57abc4ce31a21bd0 Mon Sep 17 00:00:00 2001 From: zhanghongyuan Date: Wed, 3 Dec 2025 09:45:26 +0800 Subject: [PATCH] build: conditionally disable driver features for Qt6 builds Add DISABLE_DRIVER macro definition when building with Qt6 to ensure compatibility. The macro conditionally hides driver management buttons in the main window title bar, as driver functionality is not supported in Qt6 builds while maintaining full functionality for Qt5 builds. --- deepin-devicemanager/CMakeLists.txt | 7 +++++++ deepin-devicemanager/src/Page/MainWindow.cpp | 4 +--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/deepin-devicemanager/CMakeLists.txt b/deepin-devicemanager/CMakeLists.txt index da978795..83b36d8c 100644 --- a/deepin-devicemanager/CMakeLists.txt +++ b/deepin-devicemanager/CMakeLists.txt @@ -43,6 +43,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -z noexecstack -pie -fPIC -z lazy") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie") +if(${QT_VERSION_MAJOR} EQUAL 6) + add_definitions(-DDISABLE_DRIVER) + message(STATUS "DISABLE_DRIVER macro added for Qt6 build") +else() + message(STATUS "DISABLE_DRIVER macro NOT added for Qt5 build") +endif() + option (PERF_ON "Use provided math implementation" ON) if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "sw_64") diff --git a/deepin-devicemanager/src/Page/MainWindow.cpp b/deepin-devicemanager/src/Page/MainWindow.cpp index 175b4ff3..a618d7ee 100644 --- a/deepin-devicemanager/src/Page/MainWindow.cpp +++ b/deepin-devicemanager/src/Page/MainWindow.cpp @@ -477,14 +477,12 @@ void MainWindow::initWindowTitle() } }); titlebar()->addWidget(mp_ButtonBox); - // 特殊处理 if (!Common::boardVendorType().isEmpty()) mp_ButtonBox->hide(); + #ifdef DISABLE_DRIVER mp_ButtonBox->hide(); #endif - // Hide hardware info and driver management buttons from title bar - mp_ButtonBox->hide(); } void MainWindow::initWidgets()