mirror of
https://github.com/d47081/qBittorrent.git
synced 2025-01-12 07:48:04 +00:00
Merge pull request #14491 from Chocobo1/travis
Fix TravisCI macOS builds
This commit is contained in:
commit
3a49c8f2da
@ -106,8 +106,8 @@ install:
|
|||||||
|
|
||||||
brew update > /dev/null
|
brew update > /dev/null
|
||||||
brew upgrade cmake
|
brew upgrade cmake
|
||||||
brew install ccache colormake boost openssl qt zlib
|
brew install ccache colormake boost openssl qt@5 zlib
|
||||||
brew link --force qt zlib
|
brew link --force qt@5 zlib
|
||||||
|
|
||||||
if [ "$build_system" = "cmake" ]; then
|
if [ "$build_system" = "cmake" ]; then
|
||||||
sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
|
sudo ln -s /usr/local/opt/qt/mkspecs /usr/local/mkspecs
|
||||||
|
@ -1926,7 +1926,7 @@ void MainWindow::handleUpdateCheckFinished(ProgramUpdater *updater, const bool i
|
|||||||
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
msgBox->setAttribute(Qt::WA_DeleteOnClose);
|
||||||
msgBox->setAttribute(Qt::WA_ShowWithoutActivating);
|
msgBox->setAttribute(Qt::WA_ShowWithoutActivating);
|
||||||
msgBox->setDefaultButton(QMessageBox::Yes);
|
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)
|
if (msgBox->buttonRole(button) == QMessageBox::YesRole)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user