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

Compile windowflags/windowgeometry manual tests against 4.8.

Browse Source 
Change-Id: I3611fe752168729f3605e0f451d487ca3e10d09d
Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@digia.com>
This commit is contained in:
Friedemann Kleint 2012-12-03 10:33:59 +01:00 committed by The Qt Project
parent 0d40958347
commit 1b908e13e6
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/manual/windowflags/controls.cpp
View File

@ -123,8 +123,10 @@ Qt::WindowFlags HintControl::hints() const
flags |= Qt::WindowMinimizeButtonHint; flags |= Qt::WindowMinimizeButtonHint;
if (windowMaximizeButtonCheckBox->isChecked()) if (windowMaximizeButtonCheckBox->isChecked())
flags |= Qt::WindowMaximizeButtonHint; flags |= Qt::WindowMaximizeButtonHint;
#if QT_VERSION >= 0x050000
if (windowFullscreenButtonCheckBox->isChecked()) if (windowFullscreenButtonCheckBox->isChecked())
flags |= Qt::WindowFullscreenButtonHint; flags |= Qt::WindowFullscreenButtonHint;
#endif
if (windowCloseButtonCheckBox->isChecked()) if (windowCloseButtonCheckBox->isChecked())
flags |= Qt::WindowCloseButtonHint; flags |= Qt::WindowCloseButtonHint;
if (windowContextHelpButtonCheckBox->isChecked()) if (windowContextHelpButtonCheckBox->isChecked())
@ -153,7 +155,9 @@ void HintControl::setHints(Qt::WindowFlags flags)
windowSystemMenuCheckBox->setChecked(flags & Qt::WindowSystemMenuHint); windowSystemMenuCheckBox->setChecked(flags & Qt::WindowSystemMenuHint);
windowMinimizeButtonCheckBox->setChecked(flags & Qt::WindowMinimizeButtonHint); windowMinimizeButtonCheckBox->setChecked(flags & Qt::WindowMinimizeButtonHint);
windowMaximizeButtonCheckBox->setChecked(flags & Qt::WindowMaximizeButtonHint); windowMaximizeButtonCheckBox->setChecked(flags & Qt::WindowMaximizeButtonHint);
#if QT_VERSION >= 0x050000
windowFullscreenButtonCheckBox->setChecked(flags & Qt::WindowFullscreenButtonHint); windowFullscreenButtonCheckBox->setChecked(flags & Qt::WindowFullscreenButtonHint);
#endif
windowCloseButtonCheckBox->setChecked(flags & Qt::WindowCloseButtonHint); windowCloseButtonCheckBox->setChecked(flags & Qt::WindowCloseButtonHint);
windowContextHelpButtonCheckBox->setChecked(flags & Qt::WindowContextHelpButtonHint); windowContextHelpButtonCheckBox->setChecked(flags & Qt::WindowContextHelpButtonHint);
windowShadeButtonCheckBox->setChecked(flags & Qt::WindowShadeButtonHint); windowShadeButtonCheckBox->setChecked(flags & Qt::WindowShadeButtonHint);