diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2023-03-16 08:16:34 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2023-03-16 14:48:43 +0100 |
| commit | fb24576fa479a18c36fb29426c2db547fb5511ad (patch) | |
| tree | 8599cd098a6e9f1eff9ad790cf90aae6fed07791 | |
| parent | b4814163c78e396834ad54963073cf03449073db (diff) | |
Fix compilation issues for android
Deals with:
* unknown class name 'Object'; did you mean 'QObject'?
* use of undeclared identifier 'QTimer'; did you mean 'QTime'?
Pick-to: 6.5
Change-Id: Id63064e70090ed1f816fa19db047b382220d634c
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
3 files changed, 9 insertions, 0 deletions
diff --git a/src/corelib/platform/android/qandroidnativeinterface.cpp b/src/corelib/platform/android/qandroidnativeinterface.cpp index 8bd79494e2..5b967f22bf 100644 --- a/src/corelib/platform/android/qandroidnativeinterface.cpp +++ b/src/corelib/platform/android/qandroidnativeinterface.cpp @@ -10,6 +10,7 @@ #include <QtCore/qfuture.h> #include <QtCore/qfuturewatcher.h> #include <QtCore/qpromise.h> +#include <QtCore/qtimer.h> #include <QtCore/qthreadpool.h> #include <deque> #include <memory> diff --git a/src/plugins/platforms/android/androidcontentfileengine.cpp b/src/plugins/platforms/android/androidcontentfileengine.cpp index 2be7c45bb2..6486890018 100644 --- a/src/plugins/platforms/android/androidcontentfileengine.cpp +++ b/src/plugins/platforms/android/androidcontentfileengine.cpp @@ -11,6 +11,8 @@ #include <QtCore/qdatetime.h> #include <QtCore/qmimedatabase.h> +QT_BEGIN_NAMESPACE + using namespace QNativeInterface; using namespace Qt::StringLiterals; @@ -823,4 +825,6 @@ bool DocumentFile::rename(const QString &newName) return false; } +QT_END_NAMESPACE + // End of DocumentFile diff --git a/src/plugins/platforms/android/androidcontentfileengine.h b/src/plugins/platforms/android/androidcontentfileengine.h index 56d9bae8f7..35db7b44b6 100644 --- a/src/plugins/platforms/android/androidcontentfileengine.h +++ b/src/plugins/platforms/android/androidcontentfileengine.h @@ -9,6 +9,8 @@ #include <QtCore/qjniobject.h> #include <QtCore/qlist.h> +QT_BEGIN_NAMESPACE + using DocumentFilePtr = std::shared_ptr<class DocumentFile>; class AndroidContentFileEngine : public QFSFileEngine @@ -102,4 +104,6 @@ protected: DocumentFilePtr m_parent; }; +QT_END_NAMESPACE + #endif // ANDROIDCONTENTFILEENGINE_H |