diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index a477ed9e8b3..6543d4e0dea 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -2013,7 +2013,7 @@ namespace final { BREAK_HERE; // Expand settings. // Check settings "" QSettings. - // Check settings.[QObject] "" QSettings. + // Check settings.@1 "" QObject. // Check value "" QVariant (QString). // Continue. dummyStatement(&settings, &value); @@ -3575,7 +3575,7 @@ namespace qthread { // Expand this. // Check j 3 int. // CheckType this qthread::Thread. - // Check this.[QThread] "This is thread #3" qthread::Thread. + // Check this.@1 "This is thread #3" QThread. // Continue. dummyStatement(this); } @@ -3765,7 +3765,8 @@ namespace qvariant { // Check ha1.isParsed false bool. // Check ha1.protocol QAbstractSocket::UnknownNetworkLayerProtocol (-1) QAbstractSocket::NetworkLayerProtocol. // Check ha1.scopeId "" QString. - // Check var "127.0.0.1" QVariant (QHostAddress). + // CheckType var QVariant (QHostAddress). + // Check var.data "127.0.0.1" QHostAddress. // Continue. dummyStatement(&ha1); } @@ -3783,7 +3784,7 @@ namespace qvariant { //QString type = var.typeName(); var.setValue(my); BREAK_HERE; - // Expand my my.0 my.0.value my.1 my.1.value var var.0 var.0.value var.1 var.1.value. + // Expand my my.0 my.0.value my.1 my.1.value var var.data var.data.0 var.data.0.value var.data.1 var.data.1.value. // Check my <2 items> qvariant::MyType. // Check my.0 QMapNode. // Check my.0.key 1 unsigned int. @@ -3793,15 +3794,16 @@ namespace qvariant { // Check my.1.key 3 unsigned int. // Check my.1.value <1 items> QStringList. // Check my.1.value.0 "World" QString. - // Check var <2 items> QVariant (MyType). - // Check var.0 QMapNode. - // Check var.0.key 1 unsigned int. - // Check var.0.value <1 items> QStringList. + // CheckType var QVariant (QMap). + // Check var.data <2 items> QMap. + // Check var.data.0 QMapNode. + // Check var.data.0.key 1 unsigned int. + // Check var.data.0.value <1 items> QStringList. // Check var.0.value.0 "Hello" QString. - // Check var.1 QMapNode. - // Check var.1.key 3 unsigned int. - // Check var.1.value <1 items> QStringList. - // Check var.1.value.0 "World" QString. + // Check var.data.1 QMapNode. + // Check var.data.1.key 3 unsigned int. + // Check var.data.1.value <1 items> QStringList. + // Check var.data.1.value.0 "World" QString. // Continue. var.setValue(my); var.setValue(my); @@ -3815,15 +3817,16 @@ namespace qvariant { list << 1 << 2 << 3; QVariant variant = qVariantFromValue(list); BREAK_HERE; - // Expand list variant. + // Expand list variant variant.data. // Check list <3 items> QList. // Check list.0 1 int. // Check list.1 2 int. // Check list.2 3 int. - // Check variant <3 items> QVariant (QList). - // Check variant.0 1 int. - // Check variant.1 2 int. - // Check variant.2 3 int. + // CheckType variant QVariant (QList). + // Check variant.data <3 items> QList. + // Check variant.data.0 1 int. + // Check variant.data.1 2 int. + // Check variant.data.2 3 int. // Continue. list.clear(); list = qVariantValue >(variant); @@ -5690,17 +5693,17 @@ namespace bug5799 { typedef S1 Array[10]; Array a2; BREAK_HERE; - // Expand s2 s2.bug5700::S1 s4 s4.bug5799::S3 + // Expand s2 s2.@1 s4 s4.@1 // CheckType a1 bug5799::S1 [10]. // CheckType a2 bug5799::Array. // CheckType s2 bug5799::S2. - // CheckType s2.[bug5799::S1] bug5799::S1. - // Check s2.[bug5799::S1].m1 5 int. - // Check s2.[bug5799::S1].m2 32767 int. + // CheckType s2.@1 bug5799::S1. + // Check s2.@1.m1 5 int. + // CheckType s2.@1.m2 int. // CheckType s4 bug5799::S4. - // CheckType s4.[bug5799::S3] bug5799::S3. - // Check s4.[bug5799::S3].m1 5 int. - // Check s4.[bug5799::S3].m2 0 int. + // CheckType s4.@1 bug5799::S3. + // Check s4.@1.m1 5 int. + // CheckType s4.@1.m2 int. // Continue. dummyStatement(&s2, &s4, &a1, &a2); } @@ -5819,8 +5822,8 @@ namespace bug6857 { file.setObjectName("A file"); BREAK_HERE; // Expand file. - // Check file "A file" MyFile. - // Check file.[QFile] "/tmp/tt" QFile. + // Check file "A file" bug6857::MyFile. + // Check file.@1 "/tmp/tt" QFile. // Continue. dummyStatement(&file); } @@ -5843,7 +5846,7 @@ namespace bug6858 { QFile *pfile = &file; BREAK_HERE; // Check pfile "Another file" bug6858::MyFile. - // Check pfile.[QFile] "/tmp/tt" QFile. + // Check pfile.@1 "/tmp/tt" QFile. // Continue. dummyStatement(&file, pfile); } @@ -5966,15 +5969,15 @@ namespace gdb13393 { int sharedPtr = 1; #endif BREAK_HERE; - // Expand d ptr ptrConst ptrToPtr ref refConst s. + // Expand d ptr ptr.@1 ptrConst ptrToPtr ref refConst s. // CheckType d gdb13393::Derived. - // CheckType d.[gdb13393::Base] gdb13393::Derived. + // CheckType d.@1 gdb13393::Base. // Check d.b 2 int. // CheckType ptr gdb13393::Derived. - // CheckType ptr.[gdb12293::Base] gdb13393::Base. - // Check ptr.[a] 1 int. + // CheckType ptr.@1 gdb13393::Base. + // Check ptr.@1.a 1 int. // CheckType ptrConst gdb13393::Derived. - // CheckType ptrConst.[gdb13393::Base] gdb13393::Base. + // CheckType ptrConst.@1 gdb13393::Base. // Check ptrConst.b 2 int. // CheckType ptrToPtr gdb13393::Derived. // CheckType ptrToPtr.[vptr] . @@ -6029,7 +6032,10 @@ namespace gdb10586 { // CheckType v {...}. // CheckType n gdb10586::s. // Check v.a 2 int. - // Check s.x 1 int. + // Check v.b 3 int. + // Check v.x 1 int. + // Check n.x 10 int. + // Check n.y 20 int. // Continue. dummyStatement(&v, &n); }