diff options
author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-25 09:49:47 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-09-26 19:53:54 +0200 |
commit | 18bd22656418e269ee57024a966bbc2fef70db36 (patch) | |
tree | fc84ae16568ed8f47bc0abfec011b4ebb1ae7d53 /tests/manual/windowflags | |
parent | b0b4fcd05cd5ae891da868829c1645acf7589acb (diff) |
Fix compilation of some manual tests
- qtabletevent/device_information
- dialogs
- windowflags
Change-Id: Id3e4b2aec2a873b00dcda39fb1227b24832181ca
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/manual/windowflags')
-rw-r--r-- | tests/manual/windowflags/controllerwindow.cpp | 2 | ||||
-rw-r--r-- | tests/manual/windowflags/controls.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/tests/manual/windowflags/controllerwindow.cpp b/tests/manual/windowflags/controllerwindow.cpp index 5453a0aa75..bde24b00d1 100644 --- a/tests/manual/windowflags/controllerwindow.cpp +++ b/tests/manual/windowflags/controllerwindow.cpp @@ -371,7 +371,7 @@ ControllerWindow::ControllerWindow() bottomLayout->addWidget(clearLogButton); QPushButton *quitButton = new QPushButton(tr("&Quit")); connect(quitButton, SIGNAL(clicked()), qApp, SLOT(quit())); - quitButton->setShortcut(Qt::CTRL + Qt::Key_Q); + quitButton->setShortcut(Qt::CTRL | Qt::Key_Q); bottomLayout->addWidget(quitButton); } diff --git a/tests/manual/windowflags/controls.cpp b/tests/manual/windowflags/controls.cpp index 410b928299..88c9393053 100644 --- a/tests/manual/windowflags/controls.cpp +++ b/tests/manual/windowflags/controls.cpp @@ -183,7 +183,7 @@ WindowStateControl::WindowStateControl(QWidget *parent) layout->addWidget(maximizeButton); group->addButton(fullscreenButton, Qt::WindowFullScreen); layout->addWidget(fullscreenButton); - connect(group, SIGNAL(buttonReleased(int)), this, SIGNAL(stateChanged(int))); + connect(group, &QButtonGroup::idReleased, this, &WindowStateControl::stateChanged); } Qt::WindowStates WindowStateControl::state() const @@ -301,7 +301,7 @@ TypeControl::TypeControl(QWidget *parent) layout->addWidget(toolTipRadioButton, 2, 1); group->addButton(splashScreenRadioButton, Qt::SplashScreen); layout->addWidget(splashScreenRadioButton, 3, 1); - connect(group, SIGNAL(buttonReleased(int)), this, SLOT(slotChanged())); + connect(group, &QButtonGroup::idReleased, this, &TypeControl::slotChanged); } Qt::WindowFlags TypeControl::type() const |