Merge branch 'staged' into dev

.github/workflows/build.yml

@@ -1,5 +1,9 @@
 name: SonarCloud
+concurrency: 
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
 on:
+  workflow_dispatch:
   push:
     branches:
       - dev
@@ -48,8 +52,8 @@ jobs:
         uses: SonarSource/sonarcloud-github-c-cpp@v1
       - name: Run build-wrapper
         run: |
-          cmake .
-          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} cmake --build .
+          qmake CONFIG+=release CONFIG+=no_extra_tiff_handler  CONFIG+=zim_support   CONFIG+=chinese_conversion_support
+          build-wrapper-linux-x86-64 --out-dir ${{ env.BUILD_WRAPPER_OUT_DIR }} make  -j8 
       - name: Run sonar-scanner
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

dictzip.c

@@ -575,7 +575,6 @@ void dict_data_close( dictData *header )
 	 xfree (header -> cache [i].inBuffer);
    }
 
-   memset( header, 0, sizeof( struct dictData ) );
    xfree( header );
 }
 

externalviewer.cc

@@ -35,7 +35,7 @@ void ExternalViewer::start()
 {
   connect( &viewer, SIGNAL( finished( int, QProcess::ExitStatus ) ),
            this, SLOT( deleteLater() ) );
-  connect( &viewer, SIGNAL( error( QProcess::ProcessError ) ),
+  connect( &viewer, SIGNAL( errorOccurred( QProcess::ProcessError ) ),
            this, SLOT( deleteLater() ) );
 
   QStringList args = parseCommandLine( viewerCmdLine );

icons/readme.txt

@@ -65,4 +65,6 @@ reload.png https://iconarchive.com/show/oxygen-icons-by-oxygen-icons.org/Actions
 advanced.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Actions-system-run-icon.png
 sources.png https://icons.iconarchive.com/icons/oxygen-icons.org/oxygen/128/Apps-plasma-icon.png
 
+book.svg https://github.com/johnfactotum/foliate
+
 

programs.cc

@@ -141,7 +141,7 @@ RunInstance::RunInstance(): process( this )
   connect( this, SIGNAL(processFinished()), this,
            SLOT(handleProcessFinished()), Qt::QueuedConnection );
   connect( &process, SIGNAL(finished(int)), this, SIGNAL(processFinished()));
-  connect( &process, SIGNAL(error(QProcess::ProcessError)), this,
+  connect( &process, SIGNAL(errorOccurred(QProcess::ProcessError)), this,
            SIGNAL(processFinished()) );
 }