diff options
author | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:34:32 -0700 |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dedietrich@qt.io> | 2017-07-13 16:36:10 -0700 |
commit | d38fe875c7850ca2c6ca28f91e94ae276735fac8 (patch) | |
tree | e5c92cef74e0853490d77cf0139b23f00d548a6e /tests/manual/qtabbar/tabbarform.cpp | |
parent | ac4e848c9802377b7c4ff673180f28b9ca76b746 (diff) | |
parent | 627f0a7f7d775ecd263b95dd07fca44bfcb0c5cf (diff) |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmainwindowlayout.cpp
Change-Id: I306b4f5ad11bceb336c9091241b468d455fe6bb6
Diffstat (limited to 'tests/manual/qtabbar/tabbarform.cpp')
-rw-r--r-- | tests/manual/qtabbar/tabbarform.cpp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/tests/manual/qtabbar/tabbarform.cpp b/tests/manual/qtabbar/tabbarform.cpp new file mode 100644 index 0000000000..51271f7373 --- /dev/null +++ b/tests/manual/qtabbar/tabbarform.cpp @@ -0,0 +1,13 @@ +#include "tabbarform.h" + +TabBarForm::TabBarForm(QWidget *parent) : + QWidget(parent), + ui(new Ui::TabBarForm) +{ + ui->setupUi(this); +} + +TabBarForm::~TabBarForm() +{ + delete ui; +} |