From 89807fb55f8bb5dbf7739fc4e72819fd60eaa053 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 5 Mar 2021 20:37:52 +0800 Subject: [PATCH 1/2] Specify Qt version in TravisCI build script In homebrew `qt` package is referring to Qt6 instead of Qt5. --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 0c7115e5c..6619b75d6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -106,8 +106,8 @@ install: brew update > /dev/null brew upgrade cmake - brew install ccache colormake boost openssl qt zlib - brew link --force qt zlib + brew install ccache colormake boost openssl qt@5 zlib + brew link --force qt@5 zlib if [ "$build_system" = "cmake" ]; then sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs From 12938799a6a1cb99302fd1cd7898b0fb8ff73d96 Mon Sep 17 00:00:00 2001 From: Chocobo1 Date: Fri, 5 Mar 2021 22:17:55 +0800 Subject: [PATCH 2/2] Remove unused lambda capture --- src/gui/mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 1dc302d0a..b6a208062 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1926,7 +1926,7 @@ void MainWindow::handleUpdateCheckFinished(ProgramUpdater *updater, const bool i msgBox->setAttribute(Qt::WA_DeleteOnClose); msgBox->setAttribute(Qt::WA_ShowWithoutActivating); msgBox->setDefaultButton(QMessageBox::Yes); - connect(msgBox, &QMessageBox::buttonClicked, this, [this, msgBox, updater](QAbstractButton *button) + connect(msgBox, &QMessageBox::buttonClicked, this, [msgBox, updater](QAbstractButton *button) { if (msgBox->buttonRole(button) == QMessageBox::YesRole) {