feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Dumper: Fix dumping QDir with Qt6.6

Browse Source 
Change-Id: I7ef37026c638f7e77e4e34af40c3ecff1e40e8b3
Reviewed-by: David Schulz <david.schulz@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Christian Stenger
2023-03-02 15:12:36 +01:00
parent 735417c859
commit 5ea655cabd
1 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
share/qtcreator/debugger/qttypes.py
View File

@@ -418,7 +418,24 @@ def qdump__QDir(d, value):
d.putExpandable() d.putExpandable()
privAddress = d.extractPointer(value) privAddress = d.extractPointer(value)
bit32 = d.ptrSize() == 4 bit32 = d.ptrSize() == 4
qt5 = d.qtVersion() >= 0x050000
# change fc3942114da adds FileCache
# QStringList nameFilters;
# QDir::SortFlags sort;
# QDir::Filters filters;
# std::unique_ptr<QAbstractFileEngine> fileEngine;
# QFileSystemEntry dirEntry;
# struct FileCache
# {
# QMutex mutex;
# QStringList files;
# QFileInfoList fileInfos;
# std::atomic<bool> fileListsInitialized = false;
# QFileSystemEntry absoluteDirEntry;
# QFileSystemMetaData metaData;
# };
# mutable FileCache fileCache;
# Change 9fc0965 reorders members again. # Change 9fc0965 reorders members again.
# bool fileListsInitialized # bool fileListsInitialized
@@ -454,7 +471,9 @@ def qdump__QDir(d, value):
# + 2 byte padding # + 2 byte padding
fileSystemEntrySize = 2 * d.ptrSize() + 8 fileSystemEntrySize = 2 * d.ptrSize() + 8
if d.qtVersion() >= 0x060000: if d.qtVersion() >= 0x060600:
case = 3
elif d.qtVersion() >= 0x060000:
case = 2 case = 2
elif d.qtVersion() >= 0x050300: elif d.qtVersion() >= 0x050300:
case = 1 case = 1
@@ -467,7 +486,20 @@ def qdump__QDir(d, value):
firstValue = d.extractInt(privAddress + d.ptrSize()) firstValue = d.extractInt(privAddress + d.ptrSize())
case = 1 if firstValue == 0 or firstValue == 1 else 0 case = 1 if firstValue == 0 or firstValue == 1 else 0
if case == 2: if case == 3:
if bit32:
dirEntryOffset = 24
fileCacheOffset = 52
filesOffset = fileCacheOffset + 4
fileInfosOffset = fileCacheOffset + 16
absoluteDirEntryOffset = fileCacheOffset + 32
else:
dirEntryOffset = 48
fileCacheOffset = 104
filesOffset = fileCacheOffset + 8
fileInfosOffset = fileCacheOffset + 32
absoluteDirEntryOffset = fileCacheOffset + 64
elif case == 2:
if bit32: if bit32:
filesOffset = 4 filesOffset = 4
fileInfosOffset = 16 fileInfosOffset = 16
@@ -507,6 +539,7 @@ def qdump__QDir(d, value):
d.call('int', value, 'count') # Fill cache. d.call('int', value, 'count') # Fill cache.
except: except:
pass pass
#d.putCallItem('absolutePath', '@QString', value, 'absolutePath') #d.putCallItem('absolutePath', '@QString', value, 'absolutePath')
#d.putCallItem('canonicalPath', '@QString', value, 'canonicalPath') #d.putCallItem('canonicalPath', '@QString', value, 'canonicalPath')
with SubItem(d, 'absolutePath'): with SubItem(d, 'absolutePath'):