This commit is contained in:
fourtf
2019-09-22 16:59:51 +02:00
parent fc049d8f45
commit 2c25c8a5f5
3 changed files with 7 additions and 6 deletions
+2 -1
View File
@@ -20,7 +20,8 @@ Version::Version()
#ifdef CHATTERINO_NIGHTLY_VERSION_STRING
this->dateOfBuild_ =
QString(FROM_EXTERNAL_DEFINE(CHATTERINO_NIGHTLY_VERSION_STRING))
.remove('"').split(' ')[0];
.remove('"')
.split(' ')[0];
#endif
// "Full" version string, as displayed in window title
+2 -2
View File
@@ -2,7 +2,7 @@
#include <QtGlobal>
#define CHATTERINO_VERSION "2.1.4"
#define CHATTERINO_VERSION "2.1.5"
#if defined(Q_OS_WIN)
# define CHATTERINO_OS "win"
@@ -35,4 +35,4 @@ private:
QString fullVersion_;
};
};
}; // namespace chatterino
+3 -3
View File
@@ -1,5 +1,8 @@
#include "providers/bttv/BttvEmotes.hpp"
#include <QJsonArray>
#include <QThread>
#include "common/Common.hpp"
#include "common/NetworkRequest.hpp"
#include "debug/Log.hpp"
@@ -8,9 +11,6 @@
#include "messages/ImageSet.hpp"
#include "providers/twitch/TwitchChannel.hpp"
#include <QJsonArray>
#include <QThread>
namespace chatterino {
namespace {
Url getEmoteLink(QString urlTemplate, const EmoteId &id,