Fix compiling on macOS High Sierra (#665)

* mac docs update relating to qt 

give a little more detailed installation guide for the qt installation

* Fix compiling on clang, now compiles on macOS High Sierra
This commit is contained in:
Daniel Pasch
2018-08-13 20:10:32 +02:00
committed by fourtf
parent 2448f6f538
commit c4e3bf1a8c
4 changed files with 8 additions and 6 deletions
+1 -1
View File
@@ -1,7 +1,7 @@
#pragma once
#include "util/RapidjsonHelpers.hpp"
#include "debug/Log.hpp"
#include <boost/asio.hpp>
#include <boost/asio/steady_timer.hpp>
#include <memory>
+2 -2
View File
@@ -409,7 +409,7 @@ void TwitchChannel::refreshLiveStatus()
//>>>>>>> 9bfbdefd2f0972a738230d5b95a009f73b1dd933
request.onSuccess(
[this, weak = this->weak_from_this()](auto result) -> Outcome {
[this, weak = weakOf<Channel>(this)](auto result) -> Outcome {
ChannelPtr shared = weak.lock();
if (!shared) return Failure;
@@ -550,7 +550,7 @@ void TwitchChannel::refreshChatters()
request.setCaller(QThread::currentThread());
request.onSuccess(
[this, weak = this->weak_from_this()](auto result) -> Outcome {
[this, weak = weakOf<Channel>(this)](auto result) -> Outcome {
// channel still exists?
auto shared = weak.lock();
if (!shared) return Failure;
+2 -2
View File
@@ -316,7 +316,7 @@ void BaseWindow::mousePressEvent(QMouseEvent *event)
};
if (!recursiveCheckMouseTracking(widget)) {
Log("Start moving");
log("Start moving");
this->moving = true;
}
}
@@ -331,7 +331,7 @@ void BaseWindow::mouseReleaseEvent(QMouseEvent *event)
#ifndef Q_OS_WIN
if (this->flags_ & FramelessDraggable) {
if (this->moving) {
Log("Stop moving");
log("Stop moving");
this->moving = false;
}
}