1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge integration refs/builds/qtci/dev/1618460978

Browse Source
This commit is contained in:
Qt CI Bot 2021-04-15 08:38:34 +00:00
commit e7bdf7273c
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/styles/qstylesheetstyle.cpp
View File

@ -59,8 +59,8 @@
#endif #endif
#if QT_CONFIG(textedit) #if QT_CONFIG(textedit)
#include <qtextedit.h> #include <qtextedit.h>
#endif
#include <qplaintextedit.h> #include <qplaintextedit.h>
#endif
#include <private/qwindowsstyle_p.h> #include <private/qwindowsstyle_p.h>
#if QT_CONFIG(combobox) #if QT_CONFIG(combobox)
#include <qcombobox.h> #include <qcombobox.h>
@ -2107,10 +2107,10 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, const QStyleOption
} }
#endif #endif
#if QT_CONFIG(textedit)
else if (const QPlainTextEdit *edit = qobject_cast<const QPlainTextEdit *>(obj)) { else if (const QPlainTextEdit *edit = qobject_cast<const QPlainTextEdit *>(obj)) {
extraClass |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable); extraClass |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable);
} }
#if QT_CONFIG(textedit)
else if (const QTextEdit *edit = qobject_cast<const QTextEdit *>(obj)) { else if (const QTextEdit *edit = qobject_cast<const QTextEdit *>(obj)) {
extraClass |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable); extraClass |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable);
} }
@ -2544,10 +2544,10 @@ static quint64 extendedPseudoClass(const QWidget *w)
if (const QTextEdit *edit = qobject_cast<const QTextEdit *>(w)) { if (const QTextEdit *edit = qobject_cast<const QTextEdit *>(w)) {
pc |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable); pc |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable);
} else } else
#endif
if (const QPlainTextEdit *edit = qobject_cast<const QPlainTextEdit *>(w)) { if (const QPlainTextEdit *edit = qobject_cast<const QPlainTextEdit *>(w)) {
pc |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable); pc |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable);
} }
#endif
return pc; return pc;
} }