Merge integration refs/builds/qtci/dev/1618460978
commit
e7bdf7273c
|
|
@ -59,8 +59,8 @@
|
|||
#endif
|
||||
#if QT_CONFIG(textedit)
|
||||
#include <qtextedit.h>
|
||||
#endif
|
||||
#include <qplaintextedit.h>
|
||||
#endif
|
||||
#include <private/qwindowsstyle_p.h>
|
||||
#if QT_CONFIG(combobox)
|
||||
#include <qcombobox.h>
|
||||
|
|
@ -2107,10 +2107,10 @@ QRenderRule QStyleSheetStyle::renderRule(const QObject *obj, const QStyleOption
|
|||
|
||||
}
|
||||
#endif
|
||||
#if QT_CONFIG(textedit)
|
||||
else if (const QPlainTextEdit *edit = qobject_cast<const QPlainTextEdit *>(obj)) {
|
||||
extraClass |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable);
|
||||
}
|
||||
#if QT_CONFIG(textedit)
|
||||
else if (const QTextEdit *edit = qobject_cast<const QTextEdit *>(obj)) {
|
||||
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)) {
|
||||
pc |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable);
|
||||
} else
|
||||
#endif
|
||||
if (const QPlainTextEdit *edit = qobject_cast<const QPlainTextEdit *>(w)) {
|
||||
pc |= (edit->isReadOnly() ? PseudoClass_ReadOnly : PseudoClass_Editable);
|
||||
}
|
||||
#endif
|
||||
return pc;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue