diff options
author | Liang Qi <liang.qi@qt.io> | 2016-10-27 10:22:56 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-10-27 10:23:39 +0200 |
commit | af0d0b9c06c18850626e5454b39b45255c3e36cb (patch) | |
tree | 31768765e1195781fba5350ad99e93e926dd083c /qmake/doc | |
parent | 8daa050ed2bc3502f19ae38e2c3060941a19a5a6 (diff) | |
parent | 4e196159077a820e99bc8bd306d31d0ccaa17c57 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/plugins/platforms/ios/ios.pro
src/plugins/platforms/ios/kernel.pro
src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.h
src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm
src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileenginefactory.h
src/plugins/platforms/ios/qiosintegration.h
src/widgets/widgets/qcombobox.cpp
tests/auto/widgets/dialogs/qwizard/tst_qwizard.cpp
tests/auto/widgets/graphicsview/qgraphicsitem/tst_qgraphicsitem.cpp
Change-Id: Ibaee7cbbba99e7c4b1d8926e55932ffa6030ce45
Diffstat (limited to 'qmake/doc')
-rw-r--r-- | qmake/doc/src/qmake-manual.qdoc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/qmake/doc/src/qmake-manual.qdoc b/qmake/doc/src/qmake-manual.qdoc index 7135948832..5c17f895e3 100644 --- a/qmake/doc/src/qmake-manual.qdoc +++ b/qmake/doc/src/qmake-manual.qdoc @@ -1813,6 +1813,12 @@ which qmake will replace with the actual executable name. Other variables include @ICON@, @TYPEINFO@, @LIBRARY@, and @SHORT_VERSION@. + If building for iOS, and the \c{.plist} file contains the key + \c NSPhotoLibraryUsageDescription, qmake will include an additional plugin + to the build that adds photo access support (to, e.g., + \l{QFileDialog::setDirectory()}{QFile/QFileDialog}). See Info.plist + documentation from Apple for more information regarding this key. + \note Most of the time, the default \c{Info.plist} is good enough. \section1 QMAKE_LFLAGS |