Debugger: fix optional and variant dumper test when using qt5 qmake

Change-Id: Ib9cf05384535eab9d0e39a49d96aa88af48548d2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2023-02-21 09:01:37 +01:00
parent 03779ef94b
commit 01d3ed0463

View File

@@ -686,8 +686,15 @@ struct Profile
struct Cxx11Profile : public Profile struct Cxx11Profile : public Profile
{ {
Cxx11Profile() Cxx11Profile()
: Profile("greaterThan(QT_MAJOR_VERSION,4): CONFIG += c++11\n" : Profile("greaterThan(QT_MAJOR_VERSION,4): CONFIG += c++11\n"
"else: QMAKE_CXXFLAGS += -std=c++0x\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") "&o1, &o2, &o3")
+ Cxx11Profile() + Cxx17Profile()
+ Check("o1", "<uninitialized>", "std::optional<bool>") + Check("o1", "<uninitialized>", "std::optional<bool>")
+ Check("o2", "1", "bool") // 1 -> true is done on display + Check("o2", "1", "bool") // 1 -> true is done on display
@@ -5614,7 +5621,7 @@ void tst_Dumpers::dumper_data()
"&v1, &v2, &v3") "&v1, &v2, &v3")
+ Cxx11Profile() + Cxx17Profile()
+ Check("v1", "0", "bool") + Check("v1", "0", "bool")
+ Check("v2", "1", "bool") // 1 -> true is done on display + Check("v2", "1", "bool") // 1 -> true is done on display