diff options
| author | Friedemann Kleint <Friedemann.Kleint@nokia.com> | 2012-07-11 15:12:26 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-11 16:58:53 +0200 |
| commit | 09d3ebbf2a422e5e19528877e5e2fcdab6a889f7 (patch) | |
| tree | f041c32469e1d13074234c334695fd5886033a33 /tests/manual/windowflags/controllerwindow.cpp | |
| parent | 7f2a64f4039cf41aee796d1a9c36d33e5e629b61 (diff) | |
Improve windowflags, windowgeometry manual tests.
- Make them compile with 4.8 for comparison
- Add Active to WindowStates control
- Add -layout option to windowgeometry
Change-Id: I052330eb8689883c104a0552708ea700c7cd790a
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Thomas McGuire <thomas.mcguire@kdab.com>
Diffstat (limited to 'tests/manual/windowflags/controllerwindow.cpp')
| -rw-r--r-- | tests/manual/windowflags/controllerwindow.cpp | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp index 1b547117d7..5c6bd5be81 100644 --- a/tests/manual/windowflags/controllerwindow.cpp +++ b/tests/manual/windowflags/controllerwindow.cpp @@ -39,14 +39,14 @@ ** ****************************************************************************/ -#include <QtWidgets/QMainWindow> -#include <QtWidgets/QLabel> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QRadioButton> -#include <QtWidgets/QCheckBox> -#include <QtWidgets/QGroupBox> -#include <QtWidgets/QApplication> -#include <QtWidgets/QHBoxLayout> +#include <QMainWindow> +#include <QLabel> +#include <QPushButton> +#include <QRadioButton> +#include <QCheckBox> +#include <QGroupBox> +#include <QApplication> +#include <QHBoxLayout> #include "controllerwindow.h" #include "controls.h" @@ -75,7 +75,7 @@ ControllerWindow::ControllerWindow() hintsControl->setHints(previewWindow->windowFlags()); connect(hintsControl, SIGNAL(changed(Qt::WindowFlags)), this, SLOT(updatePreview())); - statesControl = new WindowStatesControl(WindowStatesControl::WantVisibleCheckBox); + statesControl = new WindowStatesControl(WindowStatesControl::WantVisibleCheckBox|WindowStatesControl::WantActiveCheckBox); statesControl->setStates(previewWindow->windowState()); statesControl->setVisibleValue(true); connect(statesControl, SIGNAL(changed()), this, SLOT(updatePreview())); @@ -94,7 +94,12 @@ ControllerWindow::ControllerWindow() setLayout(mainLayout); setWindowTitle(tr("Window Flags (Qt version %1, %2)") - .arg(QLatin1String(qVersion()), qApp->platformName())); + .arg(QLatin1String(qVersion()), +#if QT_VERSION >= 0x050000 + qApp->platformName())); +#else + QLatin1String("<unknown>"))); +#endif updatePreview(); } |