Merge pull request #1822 from xiaoyifang/staged

merge staged to dev
xiaoyifang · Oct 13, 2024 · 9b84bf4 · 9b84bf4
2 parents 66ec040 + 40670d8
commit 9b84bf4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/PR-check-cmake.yml b/.github/workflows/PR-check-cmake.yml
@@ -17,6 +17,8 @@ jobs:
     steps:             
       - name: Install dependencies
         run: |
+          sudo apt-get update
+
           sudo apt-get install build-essential ninja-build \
           libvorbis-dev zlib1g-dev libhunspell-dev x11proto-record-dev \
           libxtst-dev liblzo2-dev libbz2-dev \
@@ -34,7 +36,6 @@ jobs:
           qt6-webengine-dev
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
           submodules: false
       - name: Run build
         run: |
@@ -49,7 +50,6 @@ jobs:
     steps:             
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
           submodules: false
       - name: Install dependencies
         run: |
@@ -92,7 +92,6 @@ jobs:
           setup-python: 'false'
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
           submodules: true
       - name: Run build
         run: |

diff --git a/src/dict/programs.cc b/src/dict/programs.cc
@@ -200,7 +200,7 @@ void RunInstance::handleProcessFinished()
     QByteArray err = process.readAllStandardError();
 
     if ( !err.isEmpty() ) {
-      error += "\n\n" + QString::fromLocal8Bit( err );
+      error += "\n\n" + QString::fromUtf8( err );
     }
   }
 
@@ -252,8 +252,8 @@ void ProgramDataRequest::instanceFinished( QByteArray output, QString error )
               prog_output = QString::fromUtf8( output.data() + 3, output.length() - 3 );
             }
             else {
-              // No BOM, assume local 8-bit encoding
-              prog_output = QString::fromLocal8Bit( output );
+              // No BOM, assume UTF-8 encoding
+              prog_output = QString::fromUtf8( output );
             }
           }
           catch ( std::exception & e ) {

diff --git a/src/ui/mainwindow.cc b/src/ui/mainwindow.cc
@@ -1851,7 +1851,7 @@ ArticleView * MainWindow::createNewTab( bool switchToIt, QString const & name )
   connect( view, &ArticleView::zoomOut, this, &MainWindow::zoomout );
   connect( view, &ArticleView::saveBookmarkSignal, this, &MainWindow::addBookmarkToFavorite );
 
-  connect( ui.searchInPageAction, &QAction::triggered, this, [ this, view ]() {
+  connect( ui.searchInPageAction, &QAction::triggered, view, [ this, view ]() {
 #ifdef Q_OS_MACOS
     //workaround to fix macos popup page search Ctrl + F
     if ( scanPopup && scanPopup->isActiveWindow() ) {