diff --git a/tests/manual/debugger/simple/simple_test_app.cpp b/tests/manual/debugger/simple/simple_test_app.cpp index db3f531ac50..5d782d4190e 100644 --- a/tests/manual/debugger/simple/simple_test_app.cpp +++ b/tests/manual/debugger/simple/simple_test_app.cpp @@ -4017,12 +4017,14 @@ namespace qstring { void testQStringRef() { +#if QT_VERSION < QT_VERSION_CHECK(6, 0, 0) QString str = "Hello"; QStringRef ref(&str, 1, 2); BREAK_HERE; // Check ref "el" QStringRef. // Continue. dummyStatement(&str, &ref); +#endif } void testQString() @@ -4067,10 +4069,7 @@ namespace formats { { const wchar_t *w = L"aöa"; QString u; - if (sizeof(wchar_t) == 4) - u = QString::fromUcs4((uint *)w); - else - u = QString::fromUtf16((ushort *)w); + u = QString::fromWCharArray(w); BREAK_HERE; // Check u "aöa" QString. // CheckType w wchar_t *. @@ -4270,12 +4269,9 @@ namespace qvariant { void testQVariant1() { QVariant value; - QVariant::Type t = QVariant::String; - value = QVariant(t, (void*)0); - *(QString*)value.data() = QString("Some string"); + value = QVariant(QString("Some string")); int i = 1; BREAK_HERE; - // Check t QVariant::String (10) QVariant::Type. // Check value "Some string" QVariant (QString). // Continue. @@ -5360,10 +5356,7 @@ namespace basic { // 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. - if (sizeof(wchar_t) == 4) - u = QString::fromUcs4((uint *)w); - else - u = QString::fromUtf16((ushort *)w); + u = QString::fromWCharArray(w); // Make sure to undo "Change Format". dummyStatement(s, w, &ww, &cw, &cc, &cs); diff --git a/tests/manual/debugger/simple/simple_test_app.pro b/tests/manual/debugger/simple/simple_test_app.pro index fa3be4deda9..af8e8895721 100644 --- a/tests/manual/debugger/simple/simple_test_app.pro +++ b/tests/manual/debugger/simple/simple_test_app.pro @@ -6,9 +6,13 @@ DESTDIR = . SOURCES += simple_test_app.cpp -QT += network xml +QT += network !isEmpty(QT.script.name): QT += script +greaterThan(QT_MAJOR_VERSION, 5): QT += core5compat +else: QT += xml + + osx { DEFINES += USE_CXX11 QMAKE_CXXFLAGS += -stdlib=libc++