diff options
author | BogDan Vatra <bogdan@kde.org> | 2019-06-06 15:29:01 +0300 |
---|---|---|
committer | BogDan Vatra <bogdan@kdab.com> | 2019-06-13 07:26:20 +0000 |
commit | 079dafc42fdfddbc6bff7d343463e16151afeb2d (patch) | |
tree | 4a7a5bde9d30468c97cf7ef2bee5c1873f524354 /src/corelib/kernel/qsharedmemory.h | |
parent | d73497cf770c92e38903850267fd8737df3578ca (diff) |
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 <eskil.abrahamsen-blomfeldt@qt.io>
Diffstat (limited to 'src/corelib/kernel/qsharedmemory.h')
-rw-r--r-- | src/corelib/kernel/qsharedmemory.h | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/src/corelib/kernel/qsharedmemory.h b/src/corelib/kernel/qsharedmemory.h index 67cf52ac17..6236c6aa4c 100644 --- a/src/corelib/kernel/qsharedmemory.h +++ b/src/corelib/kernel/qsharedmemory.h @@ -40,8 +40,14 @@ #ifndef QSHAREDMEMORY_H #define QSHAREDMEMORY_H -#include <QtCore/qobject.h> - +#include <QtCore/qglobal.h> +#ifndef QT_NO_QOBJECT +# include <QtCore/qobject.h> +#else +# include <QtCore/qobjectdefs.h> +# include <QtCore/qscopedpointer.h> +# include <QtCore/qstring.h> +#endif QT_BEGIN_NAMESPACE @@ -49,9 +55,14 @@ QT_BEGIN_NAMESPACE class QSharedMemoryPrivate; -class Q_CORE_EXPORT QSharedMemory : public QObject +class Q_CORE_EXPORT QSharedMemory +#ifndef QT_NO_QOBJECT + : public QObject +#endif { +#ifndef QT_NO_QOBJECT Q_OBJECT +#endif Q_DECLARE_PRIVATE(QSharedMemory) public: @@ -74,8 +85,17 @@ public: UnknownError }; +#ifndef QT_NO_QOBJECT QSharedMemory(QObject *parent = nullptr); QSharedMemory(const QString &key, QObject *parent = nullptr); +#else + QSharedMemory(); + QSharedMemory(const QString &key); + static QString tr(const char * str) + { + return QString::fromLatin1(str); + } +#endif ~QSharedMemory(); void setKey(const QString &key); @@ -104,6 +124,9 @@ public: private: Q_DISABLE_COPY(QSharedMemory) +#ifdef QT_NO_QOBJECT + QScopedPointer<QSharedMemoryPrivate> d_ptr; +#endif }; #endif // QT_NO_SHAREDMEMORY |