diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 15:01:32 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-11 15:05:44 +0200 |
| commit | 60fdcf74e84e23b5bddd1718fcf90bec976ef544 (patch) | |
| tree | 032d16e9a6793e4afa02a95851db8efc2bafeda1 | |
| parent | a6820f4680a8aebb3c8bc6d8c7c8232f206e4c9c (diff) | |
| parent | b6323ec944aa4d786426a767a9aa767da1a1ebc1 (diff) | |
| download | qtscript-60fdcf74e84e23b5bddd1718fcf90bec976ef544.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
.qmake.conf
Change-Id: I64aacde81bbfde91037b5c4d88c5ac8daba8f5f4
| -rw-r--r-- | src/script/doc/qtscript.qdocconf | 1 | ||||
| -rw-r--r-- | src/scripttools/doc/qtscripttools.qdocconf | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/src/script/doc/qtscript.qdocconf b/src/script/doc/qtscript.qdocconf index f657bd5..b1e3ab7 100644 --- a/src/script/doc/qtscript.qdocconf +++ b/src/script/doc/qtscript.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtscript.qdocconf) # Name of the project which must match the outputdir. Determines the .index file project = QtScript diff --git a/src/scripttools/doc/qtscripttools.qdocconf b/src/scripttools/doc/qtscripttools.qdocconf index 4eae186..7853f75 100644 --- a/src/scripttools/doc/qtscripttools.qdocconf +++ b/src/scripttools/doc/qtscripttools.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtscript.qdocconf) # Name of the project which must match the outputdir. Determines the .index file project = QtScriptTools |