noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix compiling on macOS High Sierra (#665)

Browse source 
* 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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chatterino.pro
View file

@ -33,7 +33,7 @@ equals(QMAKE_CXX, "clang++")|equals(QMAKE_CXX, "g++") {
} }
# Icons # Icons
macx:ICON = resources/images/chatterino2.icns #macx:ICON = resources/images/chatterino2.icns
win32:RC_FILE = resources/windows.rc win32:RC_FILE = resources/windows.rc
@ -71,6 +71,8 @@ win32 {
# OSX include directory # OSX include directory
macx { macx {
INCLUDEPATH += /usr/local/include INCLUDEPATH += /usr/local/include
INCLUDEPATH += /usr/local/opt/openssl/include
LIBS += -L/usr/local/opt/openssl/lib
} }
# Optional dependency on Windows SDK 7 # Optional dependency on Windows SDK 7

2
src/providers/twitch/PubsubHelpers.hpp
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "util/RapidjsonHelpers.hpp" #include "util/RapidjsonHelpers.hpp"
#include "debug/Log.hpp"
#include <boost/asio.hpp> #include <boost/asio.hpp>
#include <boost/asio/steady_timer.hpp> #include <boost/asio/steady_timer.hpp>
#include <memory> #include <memory>

4
src/providers/twitch/TwitchChannel.cpp
View file

@ -409,7 +409,7 @@ void TwitchChannel::refreshLiveStatus()
//>>>>>>> 9bfbdefd2f0972a738230d5b95a009f73b1dd933 //>>>>>>> 9bfbdefd2f0972a738230d5b95a009f73b1dd933
request.onSuccess( request.onSuccess(
[this, weak = this->weak_from_this()](auto result) -> Outcome { [this, weak = weakOf<Channel>(this)](auto result) -> Outcome {
ChannelPtr shared = weak.lock(); ChannelPtr shared = weak.lock();
if (!shared) return Failure; if (!shared) return Failure;
@ -550,7 +550,7 @@ void TwitchChannel::refreshChatters()
request.setCaller(QThread::currentThread()); request.setCaller(QThread::currentThread());
request.onSuccess( request.onSuccess(
[this, weak = this->weak_from_this()](auto result) -> Outcome { [this, weak = weakOf<Channel>(this)](auto result) -> Outcome {
// channel still exists? // channel still exists?
auto shared = weak.lock(); auto shared = weak.lock();
if (!shared) return Failure; if (!shared) return Failure;

4
src/widgets/BaseWindow.cpp
View file

@ -316,7 +316,7 @@ void BaseWindow::mousePressEvent(QMouseEvent *event)
}; };
if (!recursiveCheckMouseTracking(widget)) { if (!recursiveCheckMouseTracking(widget)) {
Log("Start moving"); log("Start moving");
this->moving = true; this->moving = true;
} }
} }
@ -331,7 +331,7 @@ void BaseWindow::mouseReleaseEvent(QMouseEvent *event)
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
if (this->flags_ & FramelessDraggable) { if (this->flags_ & FramelessDraggable) {
if (this->moving) { if (this->moving) {
Log("Stop moving"); log("Stop moving");
this->moving = false; this->moving = false;
} }
} }