summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-02-10 12:28:58 +0100
committerChristian Ehrlicher <ch.ehrlicher@gmx.de>2019-02-11 18:59:40 +0000
commit2055c451f8ff2b2f5e7de105454790d7b240a6b3 (patch)
treefadcf53b118e7584e4f4828f2aa57a9bc26b53ed /tests
parentcc8b01240f54048ca16ace963bf205e813728bfb (diff)
QtTools: replace deprecated QLayout::margin() with contentsMargins()
QLayout::margin()/setMargin() is deprecated - replace it with it's successors contentsMargins()/setContentsMargins() Change-Id: I8b6a36f3e0d0e00186a7d9cdf4827cf06f302235 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp2
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp2
-rw-r--r--tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp
index 10ad9c41e..1e2de849e 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_noobsolete/finddialog.cpp
@@ -58,7 +58,7 @@ FindDialog::FindDialog(MainWindow *parent)
ui.comboFind->setModel(new CaseSensitiveModel(0, 1, ui.comboFind));
QVBoxLayout *l = new QVBoxLayout(this);
- l->setMargin(0);
+ l->setContentsMargins(QMargins());
l->setSpacing(0);
l->addWidget(contentsWidget);
diff --git a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
index ae6d89705..dd5888043 100644
--- a/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/mergecpp_obsolete/finddialog.cpp
@@ -58,7 +58,7 @@ FindDialog::FindDialog(MainWindow *parent)
ui.comboFind->setModel(new CaseSensitiveModel(0, 1, ui.comboFind));
QVBoxLayout *l = new QVBoxLayout(this);
- l->setMargin(0);
+ l->setContentsMargins(QMargins());
l->setSpacing(0);
l->addWidget(contentsWidget);
diff --git a/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp b/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
index fd659db5a..47dda61d6 100644
--- a/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
+++ b/tests/auto/linguist/lupdate/testdata/good/parsecpp/finddialog.cpp
@@ -58,7 +58,7 @@ FindDialog::FindDialog(MainWindow *parent)
ui.comboFind->setModel(new CaseSensitiveModel(0, 1, ui.comboFind));
QVBoxLayout *l = new QVBoxLayout(this);
- l->setMargin(0);
+ l->setContentsMargins(QMargins());
l->setSpacing(0);
l->addWidget(contentsWidget);