diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@digia.com> | 2014-01-16 18:47:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-16 21:51:52 +0100 |
| commit | f34cba5db412cdeff02ad5e2bf1c4443088d9c2a (patch) | |
| tree | cfc914cb8df92cb96e0ec71c62724368dab16092 /src/gui/painting | |
| parent | e5066a3a2eb965e64f6bf6e112739222574d66d7 (diff) | |
iOS: Don't try to use NEON drawhelpers, we don't build them
On iOS we don't build the NEON drawhelpers as they are implemented using
GAS syntax assembly, so prevent drawhelpers.cpp from trying to use them.
Follow-up to 01c59ac857927043e49d4725062faea715ed49a3.
Change-Id: I3e3dc9b0e1d780db3184413d2ff3010ac8dcd37b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'src/gui/painting')
| -rw-r--r-- | src/gui/painting/qdrawhelper.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gui/painting/qdrawhelper.cpp b/src/gui/painting/qdrawhelper.cpp index 8aef64c780..75e5f1eae3 100644 --- a/src/gui/painting/qdrawhelper.cpp +++ b/src/gui/painting/qdrawhelper.cpp @@ -53,6 +53,13 @@ # endif #endif +#include <qglobal.h> +#ifdef Q_OS_IOS +// We don't build the NEON drawhelpers as they are implemented partly +// in GAS syntax assembly, which is not supported by the iOS toolchain. +#undef __ARM_NEON__ +#endif + #include <qstylehints.h> #include <qguiapplication.h> #include <qatomic.h> |