From 079dafc42fdfddbc6bff7d343463e16151afeb2d Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Thu, 6 Jun 2019 15:29:01 +0300 Subject: Run prebuilt android test APKs androidtestrunner now checks is the apk is build and if it is, it will skip the build phase. Now we can build the apks in parallel (which takes most of the time) and run them sequentially. This way running tests on Android is much faster. Change-Id: I82f34723ac08f7728cc0daab3366e03821335eed Reviewed-by: Eskil Abrahamsen Blomfeldt --- src/corelib/kernel/qsharedmemory_unix.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'src/corelib/kernel/qsharedmemory_unix.cpp') diff --git a/src/corelib/kernel/qsharedmemory_unix.cpp b/src/corelib/kernel/qsharedmemory_unix.cpp index d1d44747e0..f6d7e78441 100644 --- a/src/corelib/kernel/qsharedmemory_unix.cpp +++ b/src/corelib/kernel/qsharedmemory_unix.cpp @@ -64,8 +64,11 @@ #ifndef QT_NO_SHAREDMEMORY QT_BEGIN_NAMESPACE -QSharedMemoryPrivate::QSharedMemoryPrivate() - : QObjectPrivate(), memory(0), size(0), error(QSharedMemory::NoError), +QSharedMemoryPrivate::QSharedMemoryPrivate() : +#ifndef QT_NO_QOBJECT + QObjectPrivate(), +#endif + memory(0), size(0), error(QSharedMemory::NoError), #ifndef QT_NO_SYSTEMSEMAPHORE systemSemaphore(QString()), lockedByMe(false), #endif -- cgit v1.2.3