From 01d3ed04639409988615864440129f3edb4aa0d8 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Tue, 21 Feb 2023 09:01:37 +0100 Subject: [PATCH] Debugger: fix optional and variant dumper test when using qt5 qmake Change-Id: Ib9cf05384535eab9d0e39a49d96aa88af48548d2 Reviewed-by: Christian Stenger --- tests/auto/debugger/tst_dumpers.cpp | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tests/auto/debugger/tst_dumpers.cpp b/tests/auto/debugger/tst_dumpers.cpp index e60aad3f94e..1e563d0a35b 100644 --- a/tests/auto/debugger/tst_dumpers.cpp +++ b/tests/auto/debugger/tst_dumpers.cpp @@ -686,8 +686,15 @@ struct Profile struct Cxx11Profile : public Profile { Cxx11Profile() - : Profile("greaterThan(QT_MAJOR_VERSION,4): CONFIG += c++11\n" - "else: QMAKE_CXXFLAGS += -std=c++0x\n") + : Profile("greaterThan(QT_MAJOR_VERSION,4): CONFIG += c++11\n" + "else: QMAKE_CXXFLAGS += -std=c++0x\n") + {} +}; + +struct Cxx17Profile : public Profile +{ + Cxx17Profile() + : Profile("CONFIG += c++17\n") {} }; @@ -5596,7 +5603,7 @@ void tst_Dumpers::dumper_data() "&o1, &o2, &o3") - + Cxx11Profile() + + Cxx17Profile() + Check("o1", "", "std::optional") + Check("o2", "1", "bool") // 1 -> true is done on display @@ -5614,7 +5621,7 @@ void tst_Dumpers::dumper_data() "&v1, &v2, &v3") - + Cxx11Profile() + + Cxx17Profile() + Check("v1", "0", "bool") + Check("v2", "1", "bool") // 1 -> true is done on display