Commit baf5a10b authored by Don Gagne's avatar Don Gagne

Merge pull request #1881 from DonLakeFlyer/JoystickFix

Joystick fix
parents 81e9c564 3d296c07
...@@ -17,10 +17,10 @@ matrix: ...@@ -17,10 +17,10 @@ matrix:
env: SPEC=linux-g++-64 CONFIG=installer env: SPEC=linux-g++-64 CONFIG=installer
sudo: true sudo: true
- os: osx - os: osx
osx_image: beta-xcode6.3 osx_image: xcode7
env: SPEC=macx-clang CONFIG=debug env: SPEC=macx-clang CONFIG=debug
- os: osx - os: osx
osx_image: beta-xcode6.3 osx_image: xcode7
env: SPEC=macx-clang CONFIG=installer env: SPEC=macx-clang CONFIG=installer
- os: android - os: android
language: android language: android
......
...@@ -157,7 +157,7 @@ MacBuild { ...@@ -157,7 +157,7 @@ MacBuild {
CONFIG += x86_64 CONFIG += x86_64
CONFIG -= x86 CONFIG -= x86
QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6 QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.6
QMAKE_MAC_SDK = macosx10.9 QMAKE_MAC_SDK = macosx10.11
} }
LinuxBuild { LinuxBuild {
......
...@@ -150,7 +150,7 @@ void JoystickConfigController::_setupCurrentState(void) ...@@ -150,7 +150,7 @@ void JoystickConfigController::_setupCurrentState(void)
void JoystickConfigController::_axisValueChanged(int axis, int value) void JoystickConfigController::_axisValueChanged(int axis, int value)
{ {
if (axis >= 0 && axis <= _axisMax) { if (axis >= 0 && axis < _axisMax) {
// We always update raw values // We always update raw values
_axisRawValue[axis] = value; _axisRawValue[axis] = value;
emit axisValueChanged(axis, _axisRawValue[axis]); emit axisValueChanged(axis, _axisRawValue[axis]);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment