diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-10-06 13:04:47 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-10-06 20:12:27 +0200 |
| commit | ef25620ac1acbe7a723b6b213d7d50468a748119 (patch) | |
| tree | abdff2aed36655dfb0305d232b0ac48f8ad67391 /doc | |
| parent | 669add92d9adc15ecfa0b2d62dd90ea9066d401e (diff) | |
| parent | 6feec9da93032d11a768802ac2187d9d4153b1ec (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
mkspecs/features/mac/default_pre.prf
mkspecs/features/qpa/genericunixfontdatabase.prf
mkspecs/features/uikit/default_post.prf
mkspecs/features/uikit/resolve_config.prf
mkspecs/macx-ios-clang/features/default_post.prf
mkspecs/macx-ios-clang/features/resolve_config.prf
src/corelib/io/qiodevice.cpp
Change-Id: I6f210f71f177a3c3278a4f380542195e14e4b491
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/doc.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/doc.pro b/doc/doc.pro new file mode 100644 index 0000000000..41ceb7ceae --- /dev/null +++ b/doc/doc.pro @@ -0,0 +1,7 @@ +TEMPLATE = aux + +global_docs.files = $$PWD/global +global_docs.path = $$[QT_INSTALL_DOCS] +INSTALLS += global_docs +!prefix_build:!equals(OUT_PWD, $$PWD): \ + COPIES += global_docs |