diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@nokia.com> | 2013-09-09 08:49:42 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-09 10:40:37 +0200 |
| commit | 052d2cd6aa3c01aa42080b8be327ce963be4676a (patch) | |
| tree | 087fc9f7b4bdff58a109e224d28eb5be03127534 /src | |
| parent | 65343d4c9744f648dc0de41124c5c5083dae0551 (diff) | |
Fix cross-compiling V4 for Android on Windows
The QT_POINTER_SIZE is not detected on Windows. We can safely set
this to 32 bit for Android since we only support 32 bit builds
on Windows.
Task-number: QTBUG-33397
Change-Id: I891cf01444d1ba9216ed2c3ba33ef40c61d50dd9
Reviewed-by: BogDan Vatra <bogdan@kde.org>
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/global/qglobal.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index e72ea792dd..d3db3b9dde 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -196,6 +196,8 @@ typedef quint64 qulonglong; # define QT_POINTER_SIZE 8 # elif defined(Q_OS_WIN32) || defined(Q_OS_WINCE) # define QT_POINTER_SIZE 4 +# elif defined(Q_OS_ANDROID) +# define QT_POINTER_SIZE 4 // ### Add auto-detection to Windows configure # endif #endif |