Merge remote-tracking branch 'origin/5.8' into dev (bada2f46) · Commits · BC / public / external / Qt / QtGamepad · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

QtGamepad
- Activity
- Members
- Labels
- Releases
- Container Registry
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

Admin message

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

BC
public
external
Qt
QtGamepad
Commits
bada2f46

Commit bada2f46 authored 9 years ago by

Liang Qi

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/5.8' into dev

Change-Id: I68ec90e160086231923e514d0cdad8fc1b268c04

parents d3217e2b 56b101c0

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

config.tests/sdl/sdl.pro 0 additions, 12 deletions

config.tests/sdl/sdl.pro
configure.json 5 additions, 0 deletions

configure.json
qtgamepad.pro 0 additions, 4 deletions

qtgamepad.pro
src/gamepad/configure.json 41 additions, 0 deletions

src/gamepad/configure.json
src/plugins/gamepads/evdev/evdev.pro 1 addition, 1 deletion

src/plugins/gamepads/evdev/evdev.pro
src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp 1 addition, 1 deletion

src/plugins/gamepads/evdev/qevdevgamepadbackend.cpp
src/plugins/gamepads/gamepads.pro 2 additions, 2 deletions

src/plugins/gamepads/gamepads.pro
src/plugins/gamepads/sdl2/sdl2.pro 1 addition, 11 deletions

src/plugins/gamepads/sdl2/sdl2.pro

with 51 additions and 31 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment