linuxdeepin · deepin-bot · Jun 4, 2026 · Jun 4, 2026
diff --git a/src/src/windowstatethread.cpp b/src/src/windowstatethread.cpp
@@ -25,6 +25,11 @@ void windowStateThread::run()
 {
     qDebug() << "Starting window state monitoring loop";
     while (!isInterruptionRequested()) {
+#ifdef UNITTEST
+        // 单元测试环境下跳过 workspaceWindows()，
+        // 因为 DForeignWindow::fromWinId() 在工作线程中调用会违反 Qt 线程安全规则
+        break;
+#endif
         //获取当前工作区域内所有的窗口
         auto list = workspaceWindows();
         qDebug() << "Found" << list.size() << "windows in workspace";
@@ -38,9 +43,6 @@ void windowStateThread::run()
         }
         //线程休眠1秒
         std::this_thread::sleep_for(std::chrono::seconds(1));
-#ifdef UNITTEST
-        break;
-#endif
     }
     qInfo() << "Window state monitoring thread ended";
 }

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -1,10 +1,11 @@
 
+# 定义需要的cmake版本
+cmake_minimum_required(VERSION 3.16)
+
 # 设置工程名字
 project(deepin-camera-test VERSION 1.0.0)
 set(CMD_NAME deepin-camera-test)
 set(TARGET_NAME deepin-camera-test)
-# 定义需要的cmake版本
-cmake_minimum_required(VERSION 3.0)
 set(CMAKE_AUTOMOC ON)
 set(CMAKE_AUTORCC ON)
 set(CMAKE_AUTOUIC ON)
@@ -37,25 +38,36 @@ set(PROJECT_INCLUDE
     ./stub
     ${CMAKE_INSTALL_PREFIX}/include
     ${CMAKE_INSTALL_PREFIX}/include/libusb-1.0
+    /usr/include/libusb-1.0
     ${CMAKE_INSTALL_PREFIX}/include/SDL2
     ${PROJECT_SOURCE_DIR}/../deepin-camera
     ${PROJECT_SOURCE_DIR}/googletest/include
     )
-# 设置Qt模块
-set(QtModule Core Gui Widgets DBus Concurrent LinguistTools Multimedia PrintSupport Svg)
+# 设置Qt6模块
+set(QtModule Core Gui Widgets DBus Concurrent LinguistTools Multimedia PrintSupport Svg SvgWidgets OpenGLWidgets Xml Test)
 
-# 查找Qt相关的库链接
-find_package(Qt5 REQUIRED ${QtModule})
+# 查找Qt6相关的库链接
+find_package(Qt6 REQUIRED ${QtModule})
 find_package(PkgConfig REQUIRED)
 
 file (GLOB_RECURSE CXXSOURCES
     ./*.cpp
     ../src/src/basepub/*.cpp
-    ../src/src/*.cpp
     ../src/src/qtsingleapplication/*.cpp
     ./stub/*.cpp
     )
 
+# 收集 src/src/*.cpp (排除 videosurface.cpp)
+file(GLOB_RECURSE SRC_CXXSOURCES ../src/src/*.cpp)
+
+# 将 src/src/*.cpp (排除 videosurface.cpp) 加入编译
+foreach(src_file ${SRC_CXXSOURCES})
+    get_filename_component(src_name ${src_file} NAME)
+    if(NOT src_name STREQUAL "videosurface.cpp")
+        list(APPEND CXXSOURCES ${src_file})
+    endif()
+endforeach()
+
 file (GLOB_RECURSE CSOURCES
     ../src/src/*.c
     ../libcam/*.c
@@ -82,40 +94,55 @@ add_executable( ${TARGET_NAME} ${CXXSOURCES} ${CSOURCES} ${RESOURCES}
 
 
 pkg_check_modules(3rd_lib REQUIRED
-        dtkgui
-        dtkwidget gstreamer-1.0 gstreamer-app-1.0
+        dtk6gui
+        dtk6widget
+        gstreamer-1.0
+        gstreamer-app-1.0
         pciaccess
-#        libv4l2
-#        libudev
-#        libusb-1.0
-#        libavcodec
-#        libavutil
-#        libavformat
-#        libswscale
-#        libpng
-#        sdl2
-#        libpulse
-#        libswresample
-#        libffmpegthumbnailer
+        libva
+        libavcodec
+        libavutil
+        libavformat
+        libswscale
+        libswresample
+        libudev
         )
 # 添加第三方库的所有文件夹路径到工程中来(注意 *_INCLUDE_DIRS)
 
 target_include_directories(${TARGET_NAME} PUBLIC ${3rd_lib_INCLUDE_DIRS} ${PROJECT_INCLUDE} ${GLOB_RECURSE})
 # 将第三方库链接进来(注意 *_LIBRARIES)
-target_link_libraries(${PROJECT_NAME} ${3rd_lib_LIBRARIES}
+target_link_libraries(${TARGET_NAME} PRIVATE
+    ${3rd_lib_LIBRARIES}
     gtest
     pthread
-    Qt5Test
+    Qt6::Test
     dl
-#    portaudio
-#    asound
-#    z
+    va
+    va-x11
 
-    imagevisualresult
+    imagevisualresult6
     )
 
-# 将工程与Qt模块链接起来
-qt5_use_modules(${PROJECT_NAME} ${QtModule})
+# 将工程与Qt6模块链接起来
+target_link_libraries(${TARGET_NAME} PRIVATE
+    Qt6::Core
+    Qt6::Gui
+    Qt6::Widgets
+    Qt6::DBus
+    Qt6::Concurrent
+    Qt6::Multimedia
+    Qt6::PrintSupport
+    Qt6::Svg
+    Qt6::SvgWidgets
+    Qt6::OpenGLWidgets
+)
+
+# 链接DTK6库
+target_link_libraries(${TARGET_NAME} PRIVATE
+    dtk6core
+    dtk6gui
+    dtk6widget
+)
 
 include_directories(${PROJECT_BINARY_DIR})
 include_directories(${PROJECT_SOURCE_DIR})

diff --git a/tests/CameraTest.cpp b/tests/CameraTest.cpp
@@ -21,26 +21,27 @@
 #include "src/Settings.h"
 #include "src/mainwindow.h"
 #include "src/photorecordbtn.h"
 #include "src/majorimageprocessingthread.h"
 #include "src/capplication.h"
 #include "src/camera.h"
-#include "src/videosurface.h"
 #include "src/basepub/datamanager.h"
 #include "ac-deepin-camera-define.h"
 #include "stub/stub_function.h"
 #include "addr_pri.h"
 
 
-#include <QtTest/qtest.h>
-#include <QVideoSurfaceFormat>
+#include <QTest>
+#include <QtMultimedia/QVideoFrame>
 
 ACCESS_PRIVATE_FUN(CMainWindow, void(), initCameraConnection);
 
 ACCESS_PRIVATE_FIELD(CMainWindow, bool, m_bRecording);
+#if QT_VERSION_MAJOR <= 5
 ACCESS_PRIVATE_FIELD(Camera, QString, m_curDevName);
 ACCESS_PRIVATE_FIELD(Camera, VideoSurface*, m_videoSurface);
+#endif
 
 CameraTest::CameraTest()
 {
    DataManager::instance()->setEncodeEnv(QCamera_Env);
 }
@@ -81,6 +82,7 @@
  */
 TEST_F(CameraTest, refreshCamera)
 {
+#if QT_VERSION_MAJOR <= 5
     // 重启摄像头
     Stub_Function::resetSub(ADDR(Camera, getSupportResolutionsSize), ADDR(Stub_Function, getSupportResolutionsSize));
     Stub_Function::resetSub(ADDR(QCamera, status), ADDR(Stub_Function, cameraStatus));
@@ -94,6 +96,12 @@
     access_private_field::Cameram_curDevName(*Camera::instance()) = "/dev/video4";
     m_devnumMonitor->existDevice();
     access_private_field::Cameram_curDevName(*Camera::instance()) = "";
+#else
+    // Qt6 下仅测试设备监控功能
+    Stub_Function::resetSub(ADDR(DataManager, getdevStatus), ADDR(Stub_Function, getNoDevStatus));
+    m_devnumMonitor->existDevice();
+    Stub_Function::clearSub(ADDR(DataManager, getdevStatus));
+#endif
 }
 
 /**
@@ -145,8 +153,9 @@
     QTest::qWait(500);
 }
 
+#if QT_VERSION_MAJOR <= 5
 /**
- *  @brief videoSurface功能
+ *  @brief videoSurface功能 (Qt5 only)
  */
 TEST_F(CameraTest, videoSurfaceFunction)
 {
@@ -158,7 +167,7 @@
 }
 
 /**
- *  @brief 发送一帧图片
+ *  @brief 发送一帧图片 (Qt5 only)
  */
 TEST_F(CameraTest, presentImage)
 {
@@ -175,5 +184,5 @@
     m_processThread->m_bTake = false;
     Stub_Function::clearSub(ADDR(QVideoFrame, map));
 }
-
+#endif
 
diff --git a/tests/ClosedialogTest.cpp b/tests/ClosedialogTest.cpp
@@ -1,5 +1,5 @@
 #include <QTimer>
-#include <QtTest/QTest>
+#include <QTest>
 
 #include "ClosedialogTest.h"
 

diff --git a/tests/DevNumTest.cpp b/tests/DevNumTest.cpp
@@ -21,7 +21,7 @@
 #include "src/mainwindow.h"
 #include "src/capplication.h"
 #include "stub/stub_function.h"
-#include <QtTest/qtest.h>
+#include <QTest>
 
 DevNumberTest::DevNumberTest()
 {

diff --git a/tests/GStreamerTest.cpp b/tests/GStreamerTest.cpp
@@ -29,8 +29,7 @@
 #include "addr_pri.h"
 
 
-#include <QtTest/qtest.h>
-#include <QVideoSurfaceFormat>
+#include <QTest>
 
 ACCESS_PRIVATE_FUN(CMainWindow, void(), initCameraConnection);
 

diff --git a/tests/ImageItemTest.cpp b/tests/ImageItemTest.cpp
@@ -26,7 +26,7 @@
 #include "datamanager.h"
 #include "stub/addr_pri.h"
 #include "src/imageitem.h"
-#include <QtTest/QTest>
+#include <QTest>
 #include <QShortcut>
 
 

diff --git a/tests/MainwindowTest.cpp b/tests/MainwindowTest.cpp
@@ -10,10 +10,10 @@
 #include <QVariantMap>
 #include <QStandardPaths>
 
-#include <DWindowMaxButton>
-#include <DWindowMinButton>
-#include <DWindowCloseButton>
-#include <DPrintPreviewDialog>
+#include <dtk6/DWidget/DWindowMaxButton>
+#include <dtk6/DWidget/DWindowMinButton>
+#include <dtk6/DWidget/DWindowCloseButton>
+#include <dtk6/DWidget/DPrintPreviewDialog>
 
 #include "MainwindowTest.h"
 #include "DButtonBox"

diff --git a/tests/MainwindowTest.h b/tests/MainwindowTest.h
@@ -4,16 +4,18 @@
 #include <gtest/gtest.h>
 #include <gmock/gmock-matchers.h>
 
-#include <QtTest/QTest>
+#include <QTest>
 #include <QSharedMemory>
 
-#include <DApplication>
-#include <DMainWindow>
-#include <DWidgetUtil>
-#include <DWindowOptionButton>
-#include <DMenu>
-#include <DLog>
-#include <DApplicationSettings>
+#include <dtk6/DWidget/DApplication>
+#include <dtk6/DWidget/DMainWindow>
+#include <dtk6/DWidget/DWidgetUtil>
+#include <dtk6/DWidget/DWindowOptionButton>
+#include <dtk6/DWidget/DMenu>
+#include <dtk6/DCore/DLog>
+#if DTK_VERSION < DTK_VERSION_CHECK(6, 0, 0, 0)
+#include <dtk6/DWidget/dapplicationsettings>
+#endif
 
 #include "src/mainwindow.h"
 #include "src/capplication.h"

diff --git a/tests/MajorImageProcessingThreadTest.cpp b/tests/MajorImageProcessingThreadTest.cpp
@@ -21,7 +21,7 @@
 #include "src/majorimageprocessingthread.h"
 #include "src/capplication.h"
 #include "stub/stub_function.h"
-#include <QtTest/qtest.h>
+#include <QTest>
 extern "C"
 {
 #include "v4l2_devices.h"

diff --git a/tests/PhotoRecordBtnTest.cpp b/tests/PhotoRecordBtnTest.cpp
@@ -26,7 +26,7 @@
 #include "ac-deepin-camera-define.h"
 #include "stub/addr_pri.h"
 #include "datamanager.h"
-#include <QtTest/qtest.h>
+#include <QTest>
 
 
 PhotoRecordBtnTest::PhotoRecordBtnTest()

diff --git a/tests/RollingBoxTest.cpp b/tests/RollingBoxTest.cpp
@@ -27,7 +27,7 @@
 #include "ac-deepin-camera-define.h"
 #include "stub/addr_pri.h"
 #include "datamanager.h"
-#include <QtTest/qtest.h>
+#include <QTest>
 
 RollingBoxTest::RollingBoxTest()
 {

diff --git a/tests/TakePhotoSettingTest.cpp b/tests/TakePhotoSettingTest.cpp
@@ -24,7 +24,7 @@
 #include "src/accessibility/ac-deepin-camera-define.h"
 #include "addr_pri.h"
 
-#include <QtTest/QTest>
+#include <QTest>
 
 using namespace Dtk::Core;
 
@@ -306,7 +306,12 @@ TEST_F(TakePhotoSettingTest, exposureSlider)
 
         QTest::qWait(500);
         QPoint p(slider->rect().topLeft() + QPoint(10, 20));
+#if QT_VERSION_MAJOR <= 5
         QWheelEvent wheelEvent(p, 40, Qt::MiddleButton, Qt::NoModifier);
+#else
+        // Qt6: QWheelEvent(pos, globalPos, pixelDelta, angleDelta, buttons, modifiers, phase, inverted)
+        QWheelEvent wheelEvent(QPointF(p), QPointF(slider->mapToGlobal(p)), QPoint(0, 40), QPoint(0, 40), Qt::NoButton, Qt::NoModifier, Qt::ScrollBegin, false);
+#endif
         QApplication::sendEvent(slider, &wheelEvent);
 
         QTest::qWait(500);

diff --git a/tests/VideoWidgetTest.cpp b/tests/VideoWidgetTest.cpp
@@ -25,7 +25,7 @@
 #include "ac-deepin-camera-define.h"
 #include "stub/addr_pri.h"
 #include "datamanager.h"
-#include <QtTest/QTest>
+#include <QTest>
 
 
 ACCESS_PRIVATE_FUN(videowidget, void(), showNocam);
@@ -36,7 +36,7 @@ ACCESS_PRIVATE_FUN(videowidget, void(), stopEverything);
 ACCESS_PRIVATE_FUN(videowidget, void(), onReachMaxDelayedFrames);
 ACCESS_PRIVATE_FUN(videowidget, void(), flash);
 ACCESS_PRIVATE_FUN(videowidget, void(QGraphicsView *view), forbidScrollBar);
-ACCESS_PRIVATE_FUN(videowidget, void(PRIVIEW_ENUM_STATE state), showCountDownLabel);
+ACCESS_PRIVATE_FUN(videowidget, void(PREVIEW_ENUM_STATE state), showCountDownLabel);
 ACCESS_PRIVATE_FUN(videowidget, void(const QString &resolution), slotresolutionchanged);
 
 ACCESS_PRIVATE_FIELD(videowidget, QGraphicsTextItem *, m_pCamErrItem);