Browse Source

Merge pull request #19396 from Chocobo1/ci

GHA CI: specify a category for CodeQL analysis
adaptive-webui-19844
Chocobo1 1 year ago committed by GitHub
parent
commit
e68cf87f05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      .github/workflows/ci_ubuntu.yaml
  2. 2
      cmake/Modules/CommonConfig.cmake
  3. 4
      src/gui/addnewtorrentdialog.cpp

2
.github/workflows/ci_ubuntu.yaml

@ -94,6 +94,8 @@ jobs: @@ -94,6 +94,8 @@ jobs:
- name: Run CodeQL analysis
uses: github/codeql-action/analyze@v2
if: startsWith(matrix.libt_version, 2) && (matrix.qbt_gui == 'GUI=ON') && startsWith(matrix.qt_version, 6)
with:
category: ${{ github.base_ref || github.ref_name }}
- name: Prepare build artifacts
run: |

2
cmake/Modules/CommonConfig.cmake

@ -12,7 +12,7 @@ set(CMAKE_AUTORCC_OPTIONS --compress 9 --threshold 5) @@ -12,7 +12,7 @@ set(CMAKE_AUTORCC_OPTIONS --compress 9 --threshold 5)
add_library(qbt_common_cfg INTERFACE)
# Full C++ 20 support is required
# C++ 20 support is required
# See also https://cmake.org/cmake/help/latest/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html
# for a breakdown of the features that CMake recognizes for each C++ standard
target_compile_features(qbt_common_cfg INTERFACE

4
src/gui/addnewtorrentdialog.cpp

@ -151,8 +151,8 @@ public: @@ -151,8 +151,8 @@ public:
? BitTorrent::TorrentContentLayout::NoSubfolder
: BitTorrent::TorrentContentLayout::Subfolder);
if (!m_filePriorities.isEmpty())
m_filePriorities.resize(filesCount(), BitTorrent::DownloadPriority::Normal);
if (const int fileCount = filesCount(); !m_filePriorities.isEmpty() && (fileCount >= 0))
m_filePriorities.resize(fileCount, BitTorrent::DownloadPriority::Normal);
}
bool hasMetadata() const override

Loading…
Cancel
Save