Skip to content

Commit 1bd479a

Browse files
add-uosdeepin-bot[bot]
authored andcommitted
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.
1 parent a6947d2 commit 1bd479a

2 files changed

Lines changed: 8 additions & 3 deletions

File tree

deepin-devicemanager/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,13 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall")
4343
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wl,--as-needed -fPIE -fstack-protector-strong -D_FORTIFY_SOURCE=2 -z noexecstack -pie -fPIC -z lazy")
4444
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
4545

46+
if(${QT_VERSION_MAJOR} EQUAL 6)
47+
add_definitions(-DDISABLE_DRIVER)
48+
message(STATUS "DISABLE_DRIVER macro added for Qt6 build")
49+
else()
50+
message(STATUS "DISABLE_DRIVER macro NOT added for Qt5 build")
51+
endif()
52+
4653
option (PERF_ON "Use provided math implementation" ON)
4754

4855
if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "sw_64")

deepin-devicemanager/src/Page/MainWindow.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,14 +477,12 @@ void MainWindow::initWindowTitle()
477477
}
478478
});
479479
titlebar()->addWidget(mp_ButtonBox);
480-
// 特殊处理
481480
if (!Common::boardVendorType().isEmpty())
482481
mp_ButtonBox->hide();
482+
483483
#ifdef DISABLE_DRIVER
484484
mp_ButtonBox->hide();
485485
#endif
486-
// Hide hardware info and driver management buttons from title bar
487-
mp_ButtonBox->hide();
488486
}
489487

490488
void MainWindow::initWidgets()

0 commit comments

Comments
 (0)