From 7bdb497a839e5590418970a0795aa0862c8ed93b Mon Sep 17 00:00:00 2001 From: Shatur95 Date: Mon, 21 Dec 2020 19:07:36 +0200 Subject: Pass usedData by const reference --- singleapplication.cpp | 2 +- singleapplication.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/singleapplication.cpp b/singleapplication.cpp index 276ceee..6279713 100644 --- a/singleapplication.cpp +++ b/singleapplication.cpp @@ -36,7 +36,7 @@ * @param options Optional flags to toggle specific behaviour * @param timeout Maximum time blocking functions are allowed during app load */ -SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout, QString userData ) +SingleApplication::SingleApplication( int &argc, char *argv[], bool allowSecondary, Options options, int timeout, const QString &userData ) : app_t( argc, argv ), d_ptr( new SingleApplicationPrivate( this ) ) { Q_D( SingleApplication ); diff --git a/singleapplication.h b/singleapplication.h index d39a661..8768012 100644 --- a/singleapplication.h +++ b/singleapplication.h @@ -85,7 +85,7 @@ public: * Usually 4*timeout would be the worst case (fail) scenario. * @see See the corresponding QAPPLICATION_CLASS constructor for reference */ - explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000, QString userData = QString() ); + explicit SingleApplication( int &argc, char *argv[], bool allowSecondary = false, Options options = Mode::User, int timeout = 1000, const QString &userData = {} ); ~SingleApplication() override; /** -- cgit v1.2.1 From 0aabf7705aa14247445606e4428207ae504dff6e Mon Sep 17 00:00:00 2001 From: Shatur95 Date: Mon, 21 Dec 2020 19:09:21 +0200 Subject: Bump GitHub actions --- .github/workflows/build-cmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml index 0fd3f51..dfd46cd 100644 --- a/.github/workflows/build-cmake.yml +++ b/.github/workflows/build-cmake.yml @@ -24,10 +24,10 @@ jobs: CXXFLAGS: ${{ matrix.CXXFLAGS }} steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v2.3.4 - name: Install Qt - uses: jurplel/install-qt-action@v2.9.0 + uses: jurplel/install-qt-action@v2.11.1 with: version: ${{ matrix.qt_version }} -- cgit v1.2.1 From 963d42ceb6a03ee2e17d353068061ca3396a6cc6 Mon Sep 17 00:00:00 2001 From: Shatur95 Date: Mon, 21 Dec 2020 19:13:33 +0200 Subject: Set Ubuntu version explicitly --- .github/workflows/build-cmake.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-cmake.yml b/.github/workflows/build-cmake.yml index dfd46cd..6344b50 100644 --- a/.github/workflows/build-cmake.yml +++ b/.github/workflows/build-cmake.yml @@ -8,11 +8,11 @@ jobs: strategy: matrix: qt_version: [5.12.6, 5.13.2, 5.14.0, 5.15.0, 6.0.0] - platform: [ubuntu-latest, windows-latest, macos-latest] + platform: [ubuntu-20.04, windows-latest, macos-latest] include: - qt_version: 6.0.0 additional_arguments: -D QT_DEFAULT_MAJOR_VERSION=6 - - platform: ubuntu-latest + - platform: ubuntu-20.04 CXXFLAGS: -Wall -Wextra -pedantic -Werror - platform: macos-latest CXXFLAGS: -Wall -Wextra -pedantic -Werror -- cgit v1.2.1