Merge remote-tracking branch 'origin/staged' into dev

.github/workflows/macos-homebrew-breakpad.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-13]
-        qt_ver: [ 6.5.2 ]
+        qt_ver: [ 6.5.2,6.6.0 ]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict

.github/workflows/macos-homebrew.yml

@@ -22,7 +22,7 @@ jobs:
     strategy:
       matrix:
         os: [macos-12,macos-13]
-        qt_ver: [ 6.5.2 ]
+        qt_ver: [ 6.5.2,6.6.0 ]
         qt_arch: [clang_64]
     env:
       targetName: GoldenDict

.github/workflows/ubuntu-6.2.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-20.04]
-        qt_ver: [ 6.5.2 ]
+        qt_ver: [ 6.5.2,6.6.0 ]
         qt_arch: [gcc_64]
     env:
       version: 23.10.01

.github/workflows/ubuntu-PR-check.yml

@@ -26,7 +26,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest]
-        qt_ver: [5.15.2,6.5.2]
+        qt_ver: [5.15.2,6.5.2,6.6.0]
         qt_arch: [gcc_64]
 
     steps:

.github/workflows/windows-6.x.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [6.5.2 ]
+        qt_ver: [6.5.2,6.6.0 ]
         qt_arch: [win64_msvc2019_64]
     env:
       targetName: GoldenDict.exe

.github/workflows/windows-PR-check.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [windows-2019]
-        qt_ver: [5.15.2,6.5.2]
+        qt_ver: [5.15.2,6.5.2,6.6.0]
         qt_arch: [win64_msvc2019_64]
     steps:
       - uses: actions/setup-python@v3

src/dict/dictserver.cc

@@ -62,9 +62,8 @@ bool connectToServer( QTcpSocket & socket, QString const & url, QString & errorS
       return false;
 
     socket.connectToHost( serverUrl.host(), port );
-
     if ( socket.state() != QTcpSocket::ConnectedState ) {
-      if ( !socket.waitForConnected( 5000 ) )
+      if ( !socket.waitForConnected( 100 ) )
         break;
     }
 
@@ -335,6 +334,7 @@ void DictServerDictionary::getServerDatabases()
   if ( !errorString.isEmpty() )
     gdWarning( "Retrieving databases from \"%s\" fault: %s\n", getName().c_str(), errorString.toUtf8().data() );
   delete socket;
+  socket = nullptr;
 }
 
 class DictServerWordSearchRequest: public Dictionary::WordSearchRequest
@@ -482,7 +482,7 @@ void DictServerWordSearchRequest::run()
       if ( count ) {
         QMutexLocker _( &dataMutex );
         for ( int x = 0; x < count; x++ )
-          matches.push_back( gd::toWString( matchesList.at( x ) ) );
+          matches.emplace_back( gd::toWString( matchesList.at( x ) ) );
       }
     }
   }
@@ -496,15 +496,14 @@ void DictServerWordSearchRequest::run()
     disconnectFromServer( *socket );
 
   delete socket;
+  socket = nullptr;
   if ( !Utils::AtomicInt::loadAcquire( isCancelled ) )
     finish();
 }
 
 void DictServerWordSearchRequest::cancel()
 {
   isCancelled.ref();
-
-  QMutexLocker _( &dataMutex );
   finish();
 }
 
@@ -793,6 +792,7 @@ void DictServerArticleRequest::run()
     disconnectFromServer( *socket );
 
   delete socket;
+  socket = nullptr;
   if ( !Utils::AtomicInt::loadAcquire( isCancelled ) )
     finish();
 }
@@ -801,7 +801,6 @@ void DictServerArticleRequest::cancel()
 {
   isCancelled.ref();
 
-  QMutexLocker _( &dataMutex );
   finish();
 }
 

src/main.cc

@@ -410,8 +410,8 @@ int main( int argc, char ** argv )
   for ( const auto & localScheme : localSchemes ) {
     QWebEngineUrlScheme webUiScheme( localScheme.toLatin1() );
     webUiScheme.setSyntax( QWebEngineUrlScheme::Syntax::Host );
-    webUiScheme.setFlags( QWebEngineUrlScheme::SecureScheme | QWebEngineUrlScheme::LocalScheme
-                          | QWebEngineUrlScheme::LocalAccessAllowed | QWebEngineUrlScheme::CorsEnabled );
+    webUiScheme.setFlags( QWebEngineUrlScheme::LocalScheme | QWebEngineUrlScheme::LocalAccessAllowed
+                          | QWebEngineUrlScheme::CorsEnabled );
     QWebEngineUrlScheme::registerScheme( webUiScheme );
   }