AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Define out unused functions on WASM build

Browse Source 
The struct iovec conversion functions that are needed on Unix are
unused on WASM build. This makes the build fail with -Werror on Mac
since the WASM build is treated as a variant of Unix. Cross-compilation
with clang:
Apple clang version 13.0.0 (clang-1300.0.27.3)
Target: arm64-apple-darwin21.3.0

Fixes: QTBUG-103974
Pick-to: 6.3 6.4
Change-Id: I34c65a18832ceedb9064a98f5729e45667749461
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Mikolaj Boc 2022-06-02 13:20:05 +02:00 committed by Tor Arne Vestbø
parent 78c677376a
commit 3df23b1fe4
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/testlib/qtestcase.cpp
View File

@ -123,7 +123,7 @@ using QtMiscUtils::fromHex;
namespace {
enum DebuggerProgram { None, Gdb, Lldb };
#ifdef Q_OS_UNIX
#if defined(Q_OS_UNIX) && (!defined(Q_OS_WASM) || QT_CONFIG(thread))
static struct iovec IoVec(struct iovec vec)
{
return vec;
@ -210,7 +210,7 @@ static std::string asyncSafeToString(int n)
{
return std::to_string(n);
}
#endif // Q_OS_UNIX
#endif // defined(Q_OS_UNIX)
} // unnamed namespace
static bool alreadyDebugging()
@ -353,6 +353,7 @@ static void prepareStackTrace()
#endif // Q_OS_UNIX
}
#if !defined(Q_OS_WASM) || QT_CONFIG(thread)
static void printTestRunTime()
{
const int msecsFunctionTime = qRound(QTestLog::msecsFunctionTime());
@ -366,7 +367,7 @@ static void generateStackTrace()
if (debugger == None || alreadyDebugging())
return;
#if defined(Q_OS_UNIX) && !defined(Q_OS_WASM) && !defined(Q_OS_INTEGRITY)
# if defined(Q_OS_UNIX) && !defined(Q_OS_WASM) && !defined(Q_OS_INTEGRITY)
writeToStderr("\n=== Stack trace ===\n");
// execlp() requires null-termination, so call the default constructor
@ -403,8 +404,9 @@ static void generateStackTrace()
}
writeToStderr("=== End of stack trace ===\n");
#endif // Q_OS_UNIX && !Q_OS_WASM
# endif // Q_OS_UNIX && !Q_OS_WASM
}
#endif // !defined(Q_OS_WASM) || QT_CONFIG(thread)
static bool installCoverageTool(const char * appname, const char * testname)
{
@ -1287,7 +1289,7 @@ public:
void testFinished() {};
};
#endif
#endif // QT_CONFIG(thread)
/*!