diff --git a/.vscode/settings.json b/.vscode/settings.json index e0fce14..9dc4bae 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -23,16 +23,8 @@ "cmake.configureArgs": [ "-Wno-dev" ], - // "cmake.environment": { - // "QT_LIB_ROOT": "D:/Dev/Qt6/msvc2022_64", - // "PATH": "${env:PATH};D:/Dev/Qt6/msvc2022_64/bin" - // }, - "cmake.environment": { - "QT_LIB_ROOT": "D:/qt6", - "PATH": "${env:PATH};D:/qt6/bin" - }, "cmake.configureSettings": { - "CMAKE_PREFIX_PATH": "${env:QT_LIB_ROOT}" + "CMAKE_PREFIX_PATH": "C:/Qt/Qt5.12.12/5.12.12/msvc2017_64" }, "cmake.options.statusBarVisibility": "visible", "cmake.generator": "Ninja", diff --git a/CMakeLists.txt b/CMakeLists.txt index 52770bf..f0bf48d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -14,16 +14,6 @@ endif() # 打印用户目录 message(STATUS "User home directory: ${USER_HOME}") -set(CMAKE_PREFIX_PATH - ${CMAKE_PREFIX_PATH} - "${USER_HOME}/Qt5.14.2/5.14.2/gcc_64/" - "${USER_HOME}/Qt5.14.2/5.14.2/msvc2017_64/" - "D:/Qt/Qt5.14.2/5.14.2/msvc2017_64/" - "C:/Qt/6.7.2" - "/opt/homebrew/Cellar/qt/6.7.0_2/" - "D:/Dev/Qt6/msvc2022_64" -) - set(CMAKE_AUTOUIC ON) set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) diff --git a/MainWidget.cpp b/MainWidget.cpp index 1f87150..21d85db 100644 --- a/MainWidget.cpp +++ b/MainWidget.cpp @@ -1107,7 +1107,8 @@ if (re.match("123-45-6789").hasMatch()) { qDebug() << "Valid SSN"; } )"; - textBrowser->setMarkdown(markdownContent); + //textBrowser->setMarkdown(markdownContent); + textBrowser->setText(markdownContent); layout->addWidget(textBrowser); dialog->exec(); }