diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-04-16 16:32:08 +0200 |
commit | 6630937e63ae5797487b86743a7733c8ae5cc42c (patch) | |
tree | 3d53dacf6430f9099e1fb20835881205de674961 /examples/widgets/widgets/elidedlabel/testwidget.cpp | |
parent | 37ed6dae00640f9cc980ffda05347c12a7eb5d7e (diff) | |
parent | c7af193d2e49e9f10b86262e63d8d13abf72b5cf (diff) |
Merge commit 'dev' into 'wip/cmake-merge'
Change-Id: I176c40d031be26a1dd1cf08843e448a660598783
Diffstat (limited to 'examples/widgets/widgets/elidedlabel/testwidget.cpp')
-rw-r--r-- | examples/widgets/widgets/elidedlabel/testwidget.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/examples/widgets/widgets/elidedlabel/testwidget.cpp b/examples/widgets/widgets/elidedlabel/testwidget.cpp index 6392a4b4fa..4e013cc5de 100644 --- a/examples/widgets/widgets/elidedlabel/testwidget.cpp +++ b/examples/widgets/widgets/elidedlabel/testwidget.cpp @@ -51,14 +51,13 @@ #include "testwidget.h" #include "elidedlabel.h" -#include <QtWidgets/QLabel> -#include <QtWidgets/QPushButton> -#include <QtWidgets/QSizePolicy> -#include <QtWidgets/QGridLayout> +#include <QGridLayout> +#include <QLabel> +#include <QPushButton> //! [0] -TestWidget::TestWidget(QWidget *parent): - QWidget(parent) +TestWidget::TestWidget(QWidget *parent) + : QWidget(parent) { const QString romeo = tr( "But soft, what light through yonder window breaks? / " @@ -116,7 +115,7 @@ TestWidget::TestWidget(QWidget *parent): //! [3] //! [4] - QGridLayout *layout = new QGridLayout(); + QGridLayout *layout = new QGridLayout; layout->addWidget(label, 0, 1, Qt::AlignCenter); layout->addWidget(switchButton, 0, 2); layout->addWidget(exitButton, 0, 3); |