AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix compile warning from testing deprecated signal

Browse Source 
Silence the warning, and test event delivery in addition.

Change-Id: I59c49a2ac70ecd32429116b76643700a7ad5ce3e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-10-16 13:39:11 +02:00
parent f1408d9966
commit 87f29754ec
1 changed files with 46 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
tests/auto/widgets/kernel/qapplication/tst_qapplication.cpp
View File

@ -213,19 +213,58 @@ void tst_QApplication::staticSetup()
QVERIFY(style);
QApplication::setStyle(style);
bool palette_changed = false;
QPalette pal;
QApplication::setPalette(pal);
/*QFont font;
QApplication::setFont(font);*/
QFont font;
QApplication::setFont(font);
int argc = 0;
QApplication app(argc, nullptr);
QObject::connect(&app, &QApplication::paletteChanged, [&palette_changed]{ palette_changed = true; });
QVERIFY(!palette_changed);
class EventWatcher : public QObject
{
public:
int palette_changed = 0;
int font_changed = 0;
EventWatcher()
{
qApp->installEventFilter(this);
QT_WARNING_PUSH QT_WARNING_DISABLE_DEPRECATED
QObject::connect(qApp, &QApplication::paletteChanged, [&]{ ++palette_changed; });
QObject::connect(qApp, &QApplication::fontChanged, [&]{ ++font_changed; });
QT_WARNING_POP
}
protected:
bool eventFilter(QObject *, QEvent *event) override
{
switch (event->type()) {
case QEvent::ApplicationPaletteChange:
++palette_changed;
break;
case QEvent::ApplicationFontChange:
++font_changed;
break;
default:
break;
}
return false;
}
};
EventWatcher watcher;
QCOMPARE(watcher.palette_changed, 0);
QCOMPARE(watcher.font_changed, 0);
qApp->setPalette(QPalette(Qt::red));
QVERIFY(palette_changed);
font.setBold(!font.bold());
qApp->setFont(font);
QApplication::processEvents();
QCOMPARE(watcher.palette_changed, 2);
QCOMPARE(watcher.font_changed, 2);
}