Merge remote-tracking branch 'origin/5.6' into 5.7 (368b0bbf) · Commits · BC / public / external / Qt / QtAndroidExtras · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

QtAndroidExtras
- 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
QtAndroidExtras
Commits
368b0bbf

Commit 368b0bbf authored 9 years ago by

Liang Qi

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/5.6' into 5.7

Change-Id: I3d3f2f84808ca29a056783873dd78094a53c2875

parents 80d6ea6c d08a073f

Branches

Tags

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

dist/changes-5.6.0 22 additions, 0 deletions

dist/changes-5.6.0
examples/androidextras/notification/android-sources/res/drawable/icon.png 0 additions, 0 deletions

...extras/notification/android-sources/res/drawable/icon.png
examples/androidextras/notification/images/happy.png 0 additions, 0 deletions

examples/androidextras/notification/images/happy.png
examples/androidextras/notification/images/sad.png 0 additions, 0 deletions

examples/androidextras/notification/images/sad.png
src/androidextras/android/qandroidfunctions.h 2 additions, 2 deletions

src/androidextras/android/qandroidfunctions.h
src/androidextras/doc/images/notification.png 0 additions, 0 deletions

src/androidextras/doc/images/notification.png
src/androidextras/jni/qandroidjniobject.cpp 4 additions, 2 deletions

src/androidextras/jni/qandroidjniobject.cpp
src/androidextras/jni/qandroidjniobject.h 3 additions, 3 deletions

src/androidextras/jni/qandroidjniobject.h

with 31 additions and 7 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