mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-13 19:49:51 +01:00
Allow building against Qt 5.11 (#3105)
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
parent
5cb1022ccf
commit
961803deba
|
@ -24,6 +24,7 @@
|
|||
- 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: 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: Disabled update checker on Flatpak. (#3051)
|
||||
- Dev: Add logging for HTTP requests (#2991)
|
||||
|
|
|
@ -14,7 +14,7 @@ CCACHE_BIN = $$system(which ccache)
|
|||
CONFIG+=ccache
|
||||
}
|
||||
|
||||
MINIMUM_REQUIRED_QT_VERSION = 5.12.0
|
||||
MINIMUM_REQUIRED_QT_VERSION = 5.11.0
|
||||
|
||||
!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")
|
||||
|
|
|
@ -134,14 +134,18 @@ void SplitInput::themeChangedEvent()
|
|||
QPalette palette, placeholderPalette;
|
||||
|
||||
palette.setColor(QPalette::WindowText, this->theme->splits.input.text);
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
|
||||
placeholderPalette.setColor(
|
||||
QPalette::PlaceholderText,
|
||||
this->theme->messages.textColors.chatPlaceholder);
|
||||
#endif
|
||||
|
||||
this->updateEmoteButton();
|
||||
this->ui_.textEditLength->setPalette(palette);
|
||||
|
||||
#if (QT_VERSION >= QT_VERSION_CHECK(5, 12, 0))
|
||||
this->ui_.textEdit->setPalette(placeholderPalette);
|
||||
#endif
|
||||
this->ui_.textEdit->setStyleSheet(this->theme->splits.input.styleSheet);
|
||||
|
||||
this->ui_.hbox->setMargin(
|
||||
|
|
Loading…
Reference in a new issue