From a3f3095ff48410420170b42f3b104cbdc2b9e466 Mon Sep 17 00:00:00 2001 From: Sona Kurazyan Date: Mon, 4 Apr 2022 09:50:34 +0200 Subject: [PATCH] tst_QTextCodec::toLocal8Bit: disable the test for Android Android doesn't allow to start a QProcess with custom binary, disable the tst_QTextCodec::toLocal8Bit test. Fixes: QTBUG-102254 Pick-to: dev 6.3 Change-Id: I24156b974e1e672f4515a6722e73990f44f257e6 Reviewed-by: Ivan Solovev --- tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp index b7610d2..427e916 100644 --- a/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/core5/codecs/qtextcodec/tst_qtextcodec.cpp @@ -95,7 +95,7 @@ private slots: void codecForUtfText_data(); void codecForUtfText(); -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) void toLocal8Bit(); #endif @@ -2254,7 +2254,7 @@ void tst_QTextCodec::codecForUtfText() QVERIFY(!codec); } -#if defined(Q_OS_UNIX) +#if defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) void tst_QTextCodec::toLocal8Bit() { #if !QT_CONFIG(process) @@ -2271,7 +2271,7 @@ void tst_QTextCodec::toLocal8Bit() QCOMPARE(process.exitCode(), 0); #endif } -#endif +#endif // defined(Q_OS_UNIX) && !defined(Q_OS_ANDROID) class LoadAndConvert: public QRunnable {