diff options
author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-06-22 15:43:31 +0200 |
---|---|---|
committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2017-06-27 21:56:56 +0000 |
commit | 4ac47689fad1e7c0b169cb5959a12f9d53aee625 (patch) | |
tree | f72833c23693bf68c6c5f731823beb6814c07bff /tests/manual/windowflags/controllerwindow.h | |
parent | f09f2f240f008151c560bfb9cfe5cfe3d7889ac4 (diff) |
windowflags: Allow testing of naked QWindows, not just QWidgets
Change-Id: Ia0eddcb385207ada8c3df59d49ff1de27a2aeb71
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'tests/manual/windowflags/controllerwindow.h')
-rw-r--r-- | tests/manual/windowflags/controllerwindow.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/tests/manual/windowflags/controllerwindow.h b/tests/manual/windowflags/controllerwindow.h index 43a125a9ae..c623256112 100644 --- a/tests/manual/windowflags/controllerwindow.h +++ b/tests/manual/windowflags/controllerwindow.h @@ -60,20 +60,27 @@ private slots: void updateStateControl(); private: + void updatePreview(QWindow *); + void updatePreview(QWidget *); void createTypeGroupBox(); QCheckBox *createCheckBox(const QString &text); QRadioButton *createRadioButton(const QString &text); QMainWindow *parentWindow; - PreviewWindow *previewWindow; + + QWindow *previewWindow; + PreviewWidget *previewWidget; PreviewDialog *previewDialog; - QWidget *previewWidget; + + QWindow *activePreview; + QGroupBox *widgetTypeGroupBox; QGroupBox *additionalOptionsGroupBox; TypeControl *typeControl; HintControl *hintsControl; WindowStatesControl *statesControl; + QRadioButton *previewWindowButton; QRadioButton *previewWidgetButton; QRadioButton *previewDialogButton; QCheckBox *modalWindowCheckBox; |