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/qscreen | |
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/qscreen')
-rw-r--r-- | tests/manual/qscreen/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/manual/qscreen/main.cpp b/tests/manual/qscreen/main.cpp index e6f0dc9fd7..fced21f307 100644 --- a/tests/manual/qscreen/main.cpp +++ b/tests/manual/qscreen/main.cpp @@ -171,15 +171,15 @@ ScreenWatcherMainWindow::ScreenWatcherMainWindow(QScreen *screen) QMenu *fileMenu = menuBar()->addMenu(QLatin1String("&File")); QAction *a = fileMenu->addAction(QLatin1String("Close")); - a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_W)); + a->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_W)); connect(a, SIGNAL(triggered()), this, SLOT(close())); a = fileMenu->addAction(QLatin1String("Quit")); - a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q)); + a->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_Q)); connect(a, SIGNAL(triggered()), qApp, SLOT(quit())); QMenu *toolsMenu = menuBar()->addMenu(QLatin1String("&Tools")); a = toolsMenu->addAction(QLatin1String("Mouse Monitor")); - a->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_M)); + a->setShortcut(QKeySequence(Qt::CTRL | Qt::Key_M)); connect(a, &QAction::triggered, this, &ScreenWatcherMainWindow::startMouseMonitor); } |