noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Allow building against Qt 5.11 (#3105)

Browse source 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
nilyt 2021-08-07 10:37:02 +00:00 committed by GitHub
parent 5cb1022ccf
commit 961803deba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -24,6 +24,7 @@
- Bugfix: Fixed comma appended to username completion when not at the beginning of the message. (#3060) - Bugfix: Fixed comma appended to username completion when not at the beginning of the message. (#3060)
- Bugfix: Fixed bug misplacing chat when zooming on Chrome with Chatterino Native Host extension (#1936) - Bugfix: Fixed bug misplacing chat when zooming on Chrome with Chatterino Native Host extension (#1936)
- Bugfix: Channel point redemptions from ignored users are now properly blocked. (#3102) - Bugfix: Channel point redemptions from ignored users are now properly blocked. (#3102)
- Dev: Allow building against Qt 5.11 (#3105)
- Dev: Ubuntu packages are now available (#2936) - Dev: Ubuntu packages are now available (#2936)
- Dev: Disabled update checker on Flatpak. (#3051) - Dev: Disabled update checker on Flatpak. (#3051)
- Dev: Add logging for HTTP requests (#2991) - Dev: Add logging for HTTP requests (#2991)

2
chatterino.pro
View file

@ -14,7 +14,7 @@ CCACHE_BIN = $$system(which ccache)
CONFIG+=ccache CONFIG+=ccache
} }
MINIMUM_REQUIRED_QT_VERSION = 5.12.0 MINIMUM_REQUIRED_QT_VERSION = 5.11.0
!versionAtLeast(QT_VERSION, $$MINIMUM_REQUIRED_QT_VERSION) { !versionAtLeast(QT_VERSION, $$MINIMUM_REQUIRED_QT_VERSION) {
error("You're trying to compile with Qt $$QT_VERSION, but minimum required Qt version is $$MINIMUM_REQUIRED_QT_VERSION") error("You're trying to compile with Qt $$QT_VERSION, but minimum required Qt version is $$MINIMUM_REQUIRED_QT_VERSION")

4
src/widgets/splits/SplitInput.cpp
View file

@ -134,14 +134,18 @@ void SplitInput::themeChangedEvent()
QPalette palette, placeholderPalette; QPalette palette, placeholderPalette;
palette.setColor(QPalette::WindowText, this->theme->splits.input.text); palette.setColor(QPalette::WindowText, this->theme->splits.input.text);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
placeholderPalette.setColor( placeholderPalette.setColor(
QPalette::PlaceholderText, QPalette::PlaceholderText,
this->theme->messages.textColors.chatPlaceholder); this->theme->messages.textColors.chatPlaceholder);
#endif
this->updateEmoteButton(); this->updateEmoteButton();
this->ui_.textEditLength->setPalette(palette); this->ui_.textEditLength->setPalette(palette);
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
this->ui_.textEdit->setPalette(placeholderPalette); this->ui_.textEdit->setPalette(placeholderPalette);
#endif
this->ui_.textEdit->setStyleSheet(this->theme->splits.input.styleSheet); this->ui_.textEdit->setStyleSheet(this->theme->splits.input.styleSheet);
this->ui_.hbox->setMargin( this->ui_.hbox->setMargin(