diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-03-13 09:50:43 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2017-03-13 15:55:44 +0100 |
| commit | d51c3ecf8ef6e28557c66745f50a223cc5b1ce54 (patch) | |
| tree | 023a1ecaa944152e08ba11291ec7aadc12f59dad /doc/global/macros.qdocconf | |
| parent | f06f1adb6cc3835793a15eafa2d5a3affad712a2 (diff) | |
| parent | 3a1f4b186d8ce79717da37f808ff9a4b3e949d9c (diff) | |
Merge remote-tracking branch 'origin/5.8' into 5.9
Conflicts:
examples/network/network.pro
mkspecs/features/mac/default_post.prf
src/corelib/io/qfilesystemengine_win.cpp
src/corelib/io/qprocess.cpp
src/corelib/io/qprocess.h
src/corelib/io/qprocess_p.h
src/corelib/io/qprocess_unix.cpp
src/corelib/io/qprocess_win.cpp
src/corelib/thread/qmutex.cpp
src/platformsupport/fontdatabases/windows/windows.pri
src/plugins/platforms/eglfs/eglfsdeviceintegration.pro
tests/auto/corelib/io/io.pro
Change-Id: I8a27e0e141454818bba9c433200a4e84a88d147e
Diffstat (limited to 'doc/global/macros.qdocconf')
| -rw-r--r-- | doc/global/macros.qdocconf | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index 1182af14e9..5544da425a 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -38,3 +38,17 @@ macro.beginfloatright.HTML = "<div style=\"float: right; margin-left: 2em\">" macro.endfloat.HTML = "</div>" macro.clearfloat.HTML = "<br style=\"clear: both\" />" macro.emptyspan.HTML = "<span></span>" + +# Embed YouTube content by video ID - Example: \youtube dQw4w9WgXcQ +# Also requires a <ID>.jpg thumbnail for offline docs. In .qdocconf, add: +# +# HTML.extraimages += images/dQw4w9WgXcQ.jpg +# qhp.ProjectName.extraFiles += images/dQw4w9WgXcQ.jpg +# +macro.youtube.HTML = "<div class=\"video\">\n<span class=\"vspan\"></span>\n" \ + "<iframe src=\"https://www.youtube.com/embed/\1\"" \ + "frameborder=\"0\" allowfullscreen>\n" \ + "<a href=\"https://www.youtube.com/watch/?v=\1\">\n"\ + "<img src=\"images/\1.jpg\"" \ + "title=\"Click to play in a browser\" /></a>\n" \ + "</iframe></div>\n" |