diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-27 11:22:57 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-07-31 13:33:14 +0200 |
| commit | 23c9d4c98f3c6729b56700edc1d7144b444b16db (patch) | |
| tree | 27b20ccbf3c101dbc7bcb1e509882b6c7fc75962 /examples/widgets/widgets | |
| parent | f69a5857d115786f44d053e68c36f74526020e82 (diff) | |
| parent | 0ef66e98ccf4946a0e4513ab5fc157df0f0aca4e (diff) | |
Merge branch '5.11' into dev
Conflicts:
qmake/library/qmakebuiltins.cpp
src/plugins/platforms/windows/qwindowstabletsupport.h
src/plugins/platforms/xcb/qxcbconnection.cpp
src/plugins/platforms/xcb/qxcbconnection.h
src/plugins/platforms/xcb/qxcbconnection_xi2.cpp
src/plugins/platforms/xcb/qxcbwindow.cpp
src/widgets/styles/qstylesheetstyle.cpp
tests/auto/widgets/styles/qstylesheetstyle/tst_qstylesheetstyle.cpp
Done-With: Gatis Paeglis <gatis.paeglis@qt.io>
Change-Id: I000b0eb3cea2a5c7a99b95732bfdd41507cf916e
Diffstat (limited to 'examples/widgets/widgets')
| -rw-r--r-- | examples/widgets/widgets/tetrix/tetrixwindow.cpp | 31 |
1 files changed, 21 insertions, 10 deletions
diff --git a/examples/widgets/widgets/tetrix/tetrixwindow.cpp b/examples/widgets/widgets/tetrix/tetrixwindow.cpp index 43fbdcdea8..7e951aceb8 100644 --- a/examples/widgets/widgets/tetrix/tetrixwindow.cpp +++ b/examples/widgets/widgets/tetrix/tetrixwindow.cpp @@ -83,14 +83,25 @@ TetrixWindow::TetrixWindow() pauseButton->setFocusPolicy(Qt::NoFocus); //! [3] //! [4] - connect(startButton, SIGNAL(clicked()), board, SLOT(start())); + connect(startButton, &QPushButton::clicked, board, &TetrixBoard::start); //! [4] //! [5] - connect(quitButton , SIGNAL(clicked()), qApp, SLOT(quit())); - connect(pauseButton, SIGNAL(clicked()), board, SLOT(pause())); - connect(board, SIGNAL(scoreChanged(int)), scoreLcd, SLOT(display(int))); - connect(board, SIGNAL(levelChanged(int)), levelLcd, SLOT(display(int))); - connect(board, SIGNAL(linesRemovedChanged(int)), - linesLcd, SLOT(display(int))); + connect(quitButton , &QPushButton::clicked, qApp, &QApplication::quit); + connect(pauseButton, &QPushButton::clicked, board, &TetrixBoard::pause); +#if __cplusplus >= 201402L + connect(board, &TetrixBoard::scoreChanged, + scoreLcd, qOverload<int>(&QLCDNumber::display)); + connect(board, &TetrixBoard::levelChanged, + levelLcd, qOverload<int>(&QLCDNumber::display)); + connect(board, &TetrixBoard::linesRemovedChanged, + linesLcd, qOverload<int>(&QLCDNumber::display)); +#else + connect(board, &TetrixBoard::scoreChanged, + scoreLcd, QOverload<int>::of(&QLCDNumber::display)); + connect(board, &TetrixBoard::levelChanged, + levelLcd, QOverload<int>::of(&QLCDNumber::display)); + connect(board, &TetrixBoard::linesRemovedChanged, + linesLcd, QOverload<int>::of(&QLCDNumber::display)); +#endif //! [5] //! [6] @@ -117,9 +128,9 @@ TetrixWindow::TetrixWindow() //! [7] QLabel *TetrixWindow::createLabel(const QString &text) { - QLabel *lbl = new QLabel(text); - lbl->setAlignment(Qt::AlignHCenter | Qt::AlignBottom); - return lbl; + QLabel *label = new QLabel(text); + label->setAlignment(Qt::AlignHCenter | Qt::AlignBottom); + return label; } //! [7] |