diff options
| author | Allan Sandfeld Jensen <allan.jensen@digia.com> | 2014-04-14 15:25:11 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-16 05:54:43 +0200 |
| commit | 2c3ef650ca5de71d38f88a2568a3e3a4368bbc14 (patch) | |
| tree | 21998296591ca6cd444d65b6dd6a47cc347940af | |
| parent | 57e665075b47bacb9a8ca7f6ad033e2dca3bcb04 (diff) | |
| download | qtwebkit-2c3ef650ca5de71d38f88a2568a3e3a4368bbc14.tar.gz | |
Fix build on Android
Atomic increment/decrement was defined twice on Android, and gamepad support
doesn't build. This removesthe redundant definition, and disables gamepad
support on android.
Change-Id: I62ceae141564c4dec7a1b941ef832889e82736fb
Reviewed-by: Michael Bruning <michael.bruning@digia.com>
Reviewed-by: Sérgio Martins <sergio.martins@kdab.com>
| -rw-r--r-- | Source/WTF/wtf/Atomics.h | 3 | ||||
| -rw-r--r-- | Tools/qmake/mkspecs/features/features.prf | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/Source/WTF/wtf/Atomics.h b/Source/WTF/wtf/Atomics.h index ea4f55f95..4b3eb4b88 100644 --- a/Source/WTF/wtf/Atomics.h +++ b/Source/WTF/wtf/Atomics.h @@ -104,9 +104,6 @@ inline int atomicDecrement(int volatile* addend) { return static_cast<int>(atomi inline int atomicIncrement(int volatile* addend) { return __atomic_inc(addend) + 1; } inline int atomicDecrement(int volatile* addend) { return __atomic_dec(addend) - 1; } -inline int64_t atomicIncrement(int64_t volatile* addend) { return __sync_add_and_fetch(addend, 1); } -inline int64_t atomicDecrement(int64_t volatile* addend) { return __sync_sub_and_fetch(addend, 1); } - #elif COMPILER(GCC) #define WTF_USE_LOCKFREE_THREADSAFEREFCOUNTED 1 diff --git a/Tools/qmake/mkspecs/features/features.prf b/Tools/qmake/mkspecs/features/features.prf index 866e1c41b..52227b290 100644 --- a/Tools/qmake/mkspecs/features/features.prf +++ b/Tools/qmake/mkspecs/features/features.prf @@ -121,8 +121,8 @@ defineTest(detectFeatures) { isEmpty(SQLITE3SRCDIR):isEmpty(_QMAKE_SUPER_CACHE_): error("WebKit requires SQLite. Either make it available via pkg-config, set $SQLITE3SRCDIR or build WebKit under qt5.git.") } - # Gamepad API Support (depends on udev) - linux: WEBKIT_CONFIG += gamepad + # Gamepad API Support (depends on udev and linux/joystick.h) + linux:!android: WEBKIT_CONFIG += gamepad # Support for Graphics Surface # GraphicsSurface requires GraphicsContext3D and hence use_3d_graphics |