From ca47896204482bf4a6979e3838bf7f09f61cebeb Mon Sep 17 00:00:00 2001 From: giy <giy@omp-system.ru> Date: Fri, 02 Sep 2022 14:16:56 +0300 Subject: [PATCH] Обновление до версии 2.9.0 --- QtVsTools.Package/qt6.natvis.xml | 33 ++++++++++++++++++++++++++++++--- 1 files changed, 30 insertions(+), 3 deletions(-) diff --git a/QtVsTools.Package/qt6.natvis.xml b/QtVsTools.Package/qt6.natvis.xml index 5274053..18c7adf 100644 --- a/QtVsTools.Package/qt6.natvis.xml +++ b/QtVsTools.Package/qt6.natvis.xml @@ -259,7 +259,34 @@ </Expand> </Type> - <Type Name="##NAMESPACE##::QByteArray"> + <Type Name="##NAMESPACE##::QStringRef"> + <DisplayString Condition="m_string == nullptr">{m_string,[m_size]} u""</DisplayString> + <DisplayString Condition="m_string != nullptr">{m_string->d.ptr+m_position,[m_size]}</DisplayString> + <StringView Condition="m_string == nullptr">""</StringView> + <StringView Condition="m_string != nullptr">m_string,[m_position+m_size]</StringView> + <Expand> + <Item Name="[position]" ExcludeView="simple">m_position</Item> + <Item Name="[size]" ExcludeView="simple">m_size</Item> + <ArrayItems Condition="m_string != nullptr"> + <Size>m_size</Size> + <ValuePointer>m_string->d.ptr+m_position</ValuePointer> + </ArrayItems> + </Expand> + </Type> + + <Type Name="##NAMESPACE##::QStringView"> + <DisplayString>{m_data,[m_size]}</DisplayString> + <StringView>m_data,[m_size]</StringView> + <Expand> + <Item Name="[size]" ExcludeView="simple">m_size</Item> + <ArrayItems> + <Size>m_size</Size> + <ValuePointer>m_data</ValuePointer> + </ArrayItems> + </Expand> + </Type> + + <Type Name="##NAMESPACE##::QByteArray"> <DisplayString>"{((reinterpret_cast<char*>(d.ptr))),sb}"</DisplayString> <StringView>((reinterpret_cast<char*>(d.ptr))),sb</StringView> <Expand> @@ -286,8 +313,8 @@ <Intrinsic Name="query" Expression="*((QString*)(((char*)(d) + memberOffset(5))))" /> <Intrinsic Name="fragment" Expression="*((QString*)(((char*)(d) + memberOffset(6))))" /> - <DisplayString Condition="!isEmpty(scheme().d->size)">{scheme()}://{host()}{path()}</DisplayString> - <DisplayString Condition="isEmpty(scheme().d->size)">{path()}</DisplayString> + <DisplayString Condition="!isEmpty(scheme().d->size)">{scheme()}://{host()}{path()}</DisplayString> + <DisplayString Condition="isEmpty(scheme().d->size)">{path()}</DisplayString> <Expand> <Item Name="[scheme]">scheme()</Item> <Item Name="[username]">username()</Item> -- Gitblit v1.9.1