diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-09 10:30:20 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2016-08-09 10:30:20 +0200 |
| commit | 360c0914761dcf9b2f4ba9d99aeb79c68226be6b (patch) | |
| tree | 4872c004c83253027d3ff6ca21f957e8fe04ae6c /doc | |
| parent | 80e8def58bc248634e14d562e4358439463d154a (diff) | |
| parent | fabfd53ea5e103b85e93b133cf0896dd6499d4e1 (diff) | |
Merge 1.6 into master
Change-Id: Ic2903bf480a73ff8644ea6f6af2aadb419af40e4
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/reference/modules/android-ndk-module.qdoc | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/doc/reference/modules/android-ndk-module.qdoc b/doc/reference/modules/android-ndk-module.qdoc index 48c4b4ea6..b93ef0112 100644 --- a/doc/reference/modules/android-ndk-module.qdoc +++ b/doc/reference/modules/android-ndk-module.qdoc @@ -91,12 +91,6 @@ "gabi++_shared", "stlport_static", "stlport_shared", "gnustl_static", "gnustl_shared", "c++_static", "c++_shared". \row - \li hardFloat - \li bool - \li 1.4.2 - \li undefined - \li Whether to use the hard floating point variant of the armeabi-v7a ABI. - \row \li ndkDir \li path \li 1.4 |