Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
c1877cc35f
1 changed files with 0 additions and 5 deletions
|
|
@ -31,11 +31,6 @@ void CreateWidgetStateRecursive(not_null<QWidget*> target) {
|
||||||
if (!target->isWindow()) {
|
if (!target->isWindow()) {
|
||||||
CreateWidgetStateRecursive(target->parentWidget());
|
CreateWidgetStateRecursive(target->parentWidget());
|
||||||
WidgetCreator::Create(target);
|
WidgetCreator::Create(target);
|
||||||
#if QT_VERSION >= QT_VERSION_CHECK(5, 6, 0) \
|
|
||||||
&& QT_VERSION < QT_VERSION_CHECK(5, 7, 0)
|
|
||||||
} else {
|
|
||||||
WidgetCreator::Create(target);
|
|
||||||
#endif // Qt >= 5.6
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue