all-in-one build fix-fix

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2016-09-06 05:43:31 +00:00
parent f332165f73
commit 732baf8624
2 changed files with 2 additions and 2 deletions

View file

@ -105,7 +105,9 @@ public:
#endif #endif
}; };
#ifndef QT_ALLINONE
Q_GLOBAL_STATIC(QWidget, globalStyleInfoWidget) Q_GLOBAL_STATIC(QWidget, globalStyleInfoWidget)
#endif
QLayoutStyleInfo QGraphicsGridLayoutPrivate::styleInfo() const QLayoutStyleInfo QGraphicsGridLayoutPrivate::styleInfo() const
{ {

View file

@ -171,9 +171,7 @@ int QGraphicsLinearLayoutPrivate::gridColumn(int index) const
return int(qMin(uint(index), uint(engine.columnCount()))); return int(qMin(uint(index), uint(engine.columnCount())));
} }
#ifndef QT_ALLINONE
Q_GLOBAL_STATIC(QWidget, globalStyleInfoWidget) Q_GLOBAL_STATIC(QWidget, globalStyleInfoWidget)
#endif
QLayoutStyleInfo QGraphicsLinearLayoutPrivate::styleInfo() const QLayoutStyleInfo QGraphicsLinearLayoutPrivate::styleInfo() const
{ {