From 064f43fecf99c30666256764f7a9d61162f74f48 Mon Sep 17 00:00:00 2001 From: Christian Stenger Date: Tue, 19 Feb 2019 16:08:22 +0100 Subject: [PATCH] Dumper: Add dumper test for QSizePolicy Beside this fix handling of QSizePolicy for namespaced Qt. Change-Id: Icf4e3574f97653a7bd4d8b696c87c17ef4defefa Reviewed-by: hjk --- share/qtcreator/debugger/qttypes.py | 4 ++-- tests/auto/debugger/tst_dumpers.cpp | 13 +++++++++++++ 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/share/qtcreator/debugger/qttypes.py b/share/qtcreator/debugger/qttypes.py index 91e38feaacc..6484d5f6838 100644 --- a/share/qtcreator/debugger/qttypes.py +++ b/share/qtcreator/debugger/qttypes.py @@ -1433,8 +1433,8 @@ def qdump__QSizePolicy(d, value): with Children(d): d.putIntItem('horStretch', (bits >> 0) & 0xff) d.putIntItem('verStretch', (bits >> 8) & 0xff) - d.putEnumItem('horPolicy', (bits >> 16) & 0xf, "QSizePolicy::Policy") - d.putEnumItem('verPolicy', (bits >> 20) & 0xf, "QSizePolicy::Policy") + d.putEnumItem('horPolicy', (bits >> 16) & 0xf, "@QSizePolicy::Policy") + d.putEnumItem('verPolicy', (bits >> 20) & 0xf, "@QSizePolicy::Policy") def qform__QStack(): diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index 780fa4ec472..63f0f25bf40 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -5457,6 +5457,19 @@ void tst_Dumpers::dumper_data() + Check("e.e2", "(E::b2 | E::c2) (3)", "E::Enum2") + Check("e.e3", "(E::b3 | E::c3) (3)", "E::Enum3"); + QTest::newRow("QSizePolicy") + << Data("#include \n", + "QSizePolicy qsp1;\n" + "qsp1.setHorizontalStretch(6);\n" + "qsp1.setVerticalStretch(7);\n" + "QSizePolicy qsp2(QSizePolicy::Preferred, QSizePolicy::MinimumExpanding);\n") + + GuiProfile() + + NoCdbEngine + + Check("qsp1.horStretch", "6", "int") + + Check("qsp1.verStretch", "7", "int") + + Check("qsp2.horPolicy", "QSizePolicy::Preferred (GrowFlag|ShrinkFlag) (5)", "@QSizePolicy::Policy") + + Check("qsp2.verPolicy", "QSizePolicy::MinimumExpanding (GrowFlag|ExpandFlag) (3)", "@QSizePolicy::Policy"); + QTest::newRow("Array") << Data("",