diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-25 13:18:31 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-07-25 13:18:31 +0200 |
| commit | 6896546ba5a6ae59416fe4f527294ba731235218 (patch) | |
| tree | b5b5c8b554f6dcdf391459d996100dbb265e55d1 /doc | |
| parent | e2ce17ef00218af3db35118b036ebf19834b86e8 (diff) | |
| parent | 1dd9a54ab63d267268b6262b11c7b0189370f174 (diff) | |
| download | qt-creator-6896546ba5a6ae59416fe4f527294ba731235218.tar.gz | |
Merge remote-tracking branch 'origin/2.8'
Conflicts:
src/plugins/cpptools/cppmodelmanager.cpp
Change-Id: I0e69dfad951eb81d8008f5ca05e8fb6999ae2c8a
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/src/android/androiddev.qdoc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/src/android/androiddev.qdoc b/doc/src/android/androiddev.qdoc index 1a2317849c..8f9f7dded5 100644 --- a/doc/src/android/androiddev.qdoc +++ b/doc/src/android/androiddev.qdoc @@ -128,7 +128,7 @@ you must install Qt for Android from the Qt 5.1 packages. For more information, see - \l{http://qt-project.org/doc/qt-5.0/qtdoc/android-support.html}{Android}. + \l{http://qt-project.org/doc/qt-5.1/qtdoc/android-support.html}{Android}. To configure connections between \QC and Android devices: |