feat: adapt Javascript plugin to qt6.8

log: as title
linuxdeepin · Jan 23, 2025 · ab87de6 · ab87de6
1 parent ce33cbb
commit ab87de6
Show file tree

Hide file tree

Showing 6 changed files with 53 additions and 8 deletions.
diff --git a/src/plugins/CMakeLists.txt b/src/plugins/CMakeLists.txt
@@ -11,9 +11,9 @@ add_subdirectory(debugger)
 add_subdirectory(codeeditor)
 add_subdirectory(filebrowser)
 if (QT_VERSION_MAJOR MATCHES 5)
-#add_subdirectory(collaborators)
-# add_subdirectory(javascript)
+add_subdirectory(collaborators)
 endif()
+add_subdirectory(javascript)
 add_subdirectory(console)
 add_subdirectory(builder)
 #remove it until system lock issue resolved.

diff --git a/src/plugins/javascript/CMakeLists.txt b/src/plugins/javascript/CMakeLists.txt
@@ -2,7 +2,13 @@ cmake_minimum_required(VERSION 3.0.2)
 
 project(javascript)
 
-find_package(Qt${QT_DESIRED_VERSION} COMPONENTS Xml REQUIRED)
+find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Xml REQUIRED)
+
+if (${QT_VERSION_MAJOR} MATCHES 6)
+    find_package(Qt6 REQUIRED COMPONENTS Qml)
+else()
+    find_package(Qt5 REQUIRED COMPONENTS Script ScriptTools Qml)
+endif()
 
 set(javascript_CPP
     javascriptplugin.cpp
@@ -37,10 +43,35 @@ target_link_libraries(${PROJECT_NAME}
     duc-base
     duc-services
     duc-common
-    Qt${QT_DESIRED_VERSION}::Xml
+    Qt${QT_VERSION_MAJOR}::Xml
     ${QtUseModules}
     ${PkgUserModules}
     )
 
+if (${QT_VERSION_MAJOR} MATCHES 6)
+    target_link_libraries(${PROJECT_NAME}
+        duc-framework
+        duc-base
+        duc-services
+        duc-common
+        Qt6::Xml
+        Qt6::Qml
+        ${QtUseModules}
+        ${PkgUserModules}
+        )
+else()
+    target_link_libraries(${PROJECT_NAME}
+        duc-framework
+        duc-base
+        duc-services
+        duc-common
+        Qt5::Xml
+        Qt5::Script
+        Qt5::ScriptTools
+        ${QtUseModules}
+        ${PkgUserModules}
+        )
+endif()
+
 install_logo(${PROJECT_NAME}.svg)
 install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${PLUGIN_INSTALL_PATH})
diff --git a/src/plugins/javascript/debugger/jsdebugger.cpp b/src/plugins/javascript/debugger/jsdebugger.cpp
@@ -12,6 +12,7 @@
 #include <QTextStream>
 #include <QDebug>
 #include <QAction>
+#if QT_VERSION <= 0x060000
 
 #define SAFE_DELETE(p) \
 if (p) {               \
@@ -251,3 +252,5 @@ void JSDebugger::setupDebugEnv()
     runState = kNoRun;
     emit runStateChanged(kNoRun);
 }
+
+#endif
diff --git a/src/plugins/javascript/debugger/jsdebugger.h b/src/plugins/javascript/debugger/jsdebugger.h
@@ -1,12 +1,11 @@
 // SPDX-FileCopyrightText: 2023 UnionTech Software Technology Co., Ltd.
 //
 // SPDX-License-Identifier: GPL-3.0-or-later
-
 #ifndef JSDebugger_H
 #define JSDebugger_H
 
 #include "base/abstractdebugger.h"
-
+#if QT_VERSION <= 0x060000
 #include <QObject>
 #include <QtScript/QScriptEngine>
 #include <QScriptEngineDebugger>
@@ -72,4 +71,5 @@ public slots:
     AbstractWidget *codeEditor = nullptr;
 };
 
+#endif
 #endif // JSDebugger_H
diff --git a/src/plugins/javascript/javascriptplugin.cpp b/src/plugins/javascript/javascriptplugin.cpp
@@ -11,13 +11,18 @@
 #include "services/window/windowservice.h"
 #include "services/debugger/debuggerservice.h"
 #include "base/abstractwidget.h"
+
+#if QT_VERSION <= 0x060000
 #include "debugger/jsdebugger.h"
 
 #include <QtWidgets/QAction>
 #include <QtScript>
+
 #ifndef QT_NO_SCRIPTTOOLS
 #include <QtScriptTools>
 #endif
+#endif
+
 #include <QMainWindow>
 #include <QApplication>
 
@@ -53,13 +58,14 @@ bool JavascriptPlugin::start()
         projectService->implGenerator<JSProjectGenerator>(JSProjectGenerator::toolKitName(), &errorString);
     }
 
-    // debugger register.
+#if QT_VERSION <= 0x060000
+    // debugger register. Qt6 dose not supprt
     auto jsDebugger = new JSDebugger(qApp);
     auto debuggerService = dpfGetService(DebuggerService);
     if (debuggerService && debuggerService->registerDebugger) {
         debuggerService->registerDebugger("local", jsDebugger);
     }
-
+#endif
     return true;
 }
 

diff --git a/src/plugins/javascript/jsgenerator.cpp b/src/plugins/javascript/jsgenerator.cpp
@@ -38,7 +38,12 @@ bool JSGenerator::prepareDebug(const QMap<QString, QVariant> &param, QString &re
 {
     Q_UNUSED(param)
     Q_UNUSED(retMsg)
+#if QT_VERSION <= 0x060000
     return true;
+#else
+    retMsg = tr("JavaScript can`t Debugging in Qt6 envrionment");
+    return false;
+#endif
 }
 
 bool JSGenerator::requestDAPPort(const QString &ppid, const QMap<QString, QVariant> &param, QString &retMsg)