summaryrefslogtreecommitdiffstats
path: root/src/src.pro
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@digia.com>2014-09-02 10:35:18 +0300
committerSamuli Piippo <samuli.piippo@digia.com>2014-09-02 10:35:34 +0300
commit3a4fb56b69957ada6e59a669ea38df948794dbd0 (patch)
tree8ae9a2bf9f20cd353245a40e37fe6801fe0cff14 /src/src.pro
parentd84c4a93309f45fc4372c80f3a402b29b95f07f0 (diff)
parent5bbd7f92e895d63439165fd0d3dfd5ee80bd6d7b (diff)
Merge remote-tracking branch 'origin/stable' into dev
* origin/stable: (42 commits) Doc: split up the docs into multiple files Doc: Bump version to 3.1.1 Doc: ChangeLog for QtEE 3.1.1 release Doc: Minor update to Toradex Apalis iMX6 boot instructions Get rid of the missing cmake tests error from qmake with Qt 5.4 Doc: Update URLs for external pages [Doc] Troubleshooting - add note about flashing BD's i.MX6 Doc: Mention the new templates in Building and Running topic Doc: ChangeLog for 3.1.0 release Doc: Android-specific instructions for Qt Creator Kit setup Doc: Add note about crash message when closing an application Fix #ifdef for Android detection Doc: Bump version to 3.1.0 Doc: Update the Supported Platforms page Doc: Fix path for sabre install doc: add documentation for Toradex Apalis iMX6 Doc: injection to eAndroid reference devices Fix Wifi issues on Android 4.4.2 Don't hardcode interface name in getIPAddress() Doc: Update the list of supported platforms ... Change-Id: I54e820d5c1a970ed4afb899ced453269bbc97002
Diffstat (limited to 'src/src.pro')
0 files changed, 0 insertions, 0 deletions