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

Debugger: Fix compilation of manual dumper test with Qt 6

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: Id835f4d9ac85e701cc57290e686f17a57ee221e2
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-12-01 13:56:28 +01:00
parent 8e0780e28c
commit b1f5bfdd4e
2 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/manual/debugger/simple/simple_test_app.cpp
View File

@@ -4017,12 +4017,14 @@ namespace qstring {
void testQStringRef() void testQStringRef()
{ {
#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0)
QString str = "Hello"; QString str = "Hello";
QStringRef ref(&str, 1, 2); QStringRef ref(&str, 1, 2);
BREAK_HERE; BREAK_HERE;
// Check ref "el" QStringRef. // Check ref "el" QStringRef.
// Continue. // Continue.
dummyStatement(&str, &ref); dummyStatement(&str, &ref);
#endif
} }
void testQString() void testQString()
@@ -4067,10 +4069,7 @@ namespace formats {
{ {
const wchar_t *w = L"aöa"; const wchar_t *w = L"aöa";
QString u; QString u;
if (sizeof(wchar_t) == 4) u = QString::fromWCharArray(w);
u = QString::fromUcs4((uint *)w);
else
u = QString::fromUtf16((ushort *)w);
BREAK_HERE; BREAK_HERE;
// Check u "aöa" QString. // Check u "aöa" QString.
// CheckType w wchar_t *. // CheckType w wchar_t *.
@@ -4270,12 +4269,9 @@ namespace qvariant {
void testQVariant1() void testQVariant1()
{ {
QVariant value; QVariant value;
QVariant::Type t = QVariant::String; value = QVariant(QString("Some string"));
value = QVariant(t, (void*)0);
*(QString*)value.data() = QString("Some string");
int i = 1; int i = 1;
BREAK_HERE; BREAK_HERE;
// Check t QVariant::String (10) QVariant::Type.
// Check value "Some string" QVariant (QString). // Check value "Some string" QVariant (QString).
// Continue. // Continue.
@@ -5360,10 +5356,7 @@ namespace basic {
// Windows: Select UTF-16 in "Change Format for Type" in L&W context menu. // Windows: Select UTF-16 in "Change Format for Type" in L&W context menu.
// Other: Select UCS-6 in "Change Format for Type" in L&W context menu. // Other: Select UCS-6 in "Change Format for Type" in L&W context menu.
if (sizeof(wchar_t) == 4) u = QString::fromWCharArray(w);
u = QString::fromUcs4((uint *)w);
else
u = QString::fromUtf16((ushort *)w);
// Make sure to undo "Change Format". // Make sure to undo "Change Format".
dummyStatement(s, w, &ww, &cw, &cc, &cs); dummyStatement(s, w, &ww, &cw, &cc, &cs);

6
tests/manual/debugger/simple/simple_test_app.pro
View File

@@ -6,9 +6,13 @@ DESTDIR = .
SOURCES += simple_test_app.cpp SOURCES += simple_test_app.cpp
QT += network xml QT += network
!isEmpty(QT.script.name): QT += script !isEmpty(QT.script.name): QT += script
greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat
else: QT += xml
osx { osx {
DEFINES += USE_CXX11 DEFINES += USE_CXX11
QMAKE_CXXFLAGS += -stdlib=libc++ QMAKE_CXXFLAGS += -stdlib=libc++