diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-01-31 11:43:22 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2020-02-07 18:19:51 +0000 |
| commit | 1c571e5fe7a31e7accb04b37a1d3bd7c8855d05c (patch) | |
| tree | 65241f1258136d0c45bcaa3b51e1393a2f595e6a /doc | |
| parent | 2145cdc54d5812793310f7e3b3709bfa2648bd50 (diff) | |
| parent | 4e7af2061e8c323b2a21f0549643a2cfab191664 (diff) | |
Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/CMakeLists.txt | 7 | ||||
| -rw-r--r-- | doc/global/macros.qdocconf | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt new file mode 100644 index 0000000000..f81cca7a33 --- /dev/null +++ b/doc/CMakeLists.txt @@ -0,0 +1,7 @@ +# +# Copy/Install doc configuration files to the build/install directory +# +qt_path_join(doc_install_dir ${QT_INSTALL_DIR} ${INSTALL_DOCDIR}) +qt_copy_or_install(DIRECTORY global DESTINATION ${doc_install_dir}) +qt_copy_or_install(DIRECTORY config DESTINATION ${doc_install_dir}) + diff --git a/doc/global/macros.qdocconf b/doc/global/macros.qdocconf index f553cd8e14..3a525224c1 100644 --- a/doc/global/macros.qdocconf +++ b/doc/global/macros.qdocconf @@ -18,6 +18,7 @@ macro.nullptr = "\\c{nullptr}" macro.QA = "\\e{Qt Assistant}" macro.QD = "\\e{Qt Designer}" macro.QL = "\\e{Qt Linguist}" +macro.Q_OBJECT = "Q_OBJECT" macro.QQV = "\\e{Qt QML Viewer}" macro.QtVersion = "$QT_VERSION" macro.QtVer = "$QT_VER" |