small fixes mainly related to Qt6.4

Author: fft

.github/workflows/ubuntu_release.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Install Qt
       uses: jurplel/install-qt-action@v2.14.0
       with:
-        version: 6.2.0
+        version: 6.4.0
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_QT6=ON

.github/workflows/windows_release.yml

@@ -17,18 +17,18 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
-    
+
     - name: Install Qt
       uses: jurplel/install-qt-action@v2.14.0
       with:
-        version: 6.2.0
+        version: 6.4.0
 
     - name: Configure CMake
       run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DUSE_SYSTEM_MIMETEX=OFF -DUSE_QT6=ON
 
     - name: Build
       run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}} --verbose
-    
+
     - name: Install
       run: cmake --install ${{github.workspace}}/build
 

CMakeLists.txt

@@ -37,7 +37,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
     message(FATAL_ERROR "building under MacOS not supported")
 endif()
 
-option(USE_QT6 ON)
+option(USE_QT6 "Use Qt6 instead of Qt5" ON)
 
 if(USE_QT6)
     find_package(Qt6 COMPONENTS Core Linguist Network PrintSupport Widgets Xml REQUIRED)

app/src/libraries/crypt/Pbkdf2Qt.cpp

@@ -64,7 +64,7 @@ QByteArray Pbkdf2Qt::HmacSha1(QByteArray text,
   k_pad[i]=k_pad[i]^0x36;
 
  ctx.reset();
- ctx.addData(k_pad, PBKDF2QT_SHA1_BLOCK_LENGTH);
+ ctx.addData(k_pad);
  ctx.addData(text);
  digest=ctx.result();
 
@@ -74,8 +74,8 @@ QByteArray Pbkdf2Qt::HmacSha1(QByteArray text,
   k_pad[i]=k_pad[i]^0x5c;
 
  ctx.reset();
- ctx.addData(k_pad, PBKDF2QT_SHA1_BLOCK_LENGTH);
- ctx.addData(digest, PBKDF2QT_SHA1_DIGEST_LENGTH);
+ ctx.addData(k_pad);
+ ctx.addData(digest);
  digest=ctx.result();
 
  return digest;

app/src/views/tree/TreeScreen.cpp

@@ -1303,7 +1303,7 @@ void TreeScreen::importBranchFromDirectory(QString importDir)
 
 
   // Если импорт данных был успешным
-  if(importNodeId.count()>0)
+  if(importNodeId.size()>0)
     setCursorToId(importNodeId); // Курсор устанавливается на только что импортированную ветку
 
   showMessageBox(tr("Item importing finished."));