diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:05:02 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-16 03:05:02 +0200 |
| commit | 454d80f8ad9049f4c76d6109d7808843cfefc4fd (patch) | |
| tree | 8463e6969869b4dc387c9abbd54966afcbf8bf49 | |
| parent | 5bbb2fcd57c916e0bb46a82ee9c3c0a4f9a27259 (diff) | |
| parent | f44061fa0547d048661d1efa8444da7c757fa39c (diff) | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I5622e8945b1f8afa08e4cfa4da72dbe470d816eb
| -rw-r--r-- | src/macextras/doc/QtMacExtras/AppKit/AppKit.h | 1 | ||||
| -rw-r--r-- | src/macextras/doc/QtMacExtras/Cocoa/Cocoa.h | 1 | ||||
| -rw-r--r-- | src/macextras/doc/QtMacExtras/CoreFoundation/CoreFoundation.h | 1 | ||||
| -rw-r--r-- | src/macextras/doc/qtmacextras.qdocconf | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/src/macextras/doc/QtMacExtras/AppKit/AppKit.h b/src/macextras/doc/QtMacExtras/AppKit/AppKit.h new file mode 100644 index 0000000..29e2004 --- /dev/null +++ b/src/macextras/doc/QtMacExtras/AppKit/AppKit.h @@ -0,0 +1 @@ +// Dummy header used in documentation build diff --git a/src/macextras/doc/QtMacExtras/Cocoa/Cocoa.h b/src/macextras/doc/QtMacExtras/Cocoa/Cocoa.h new file mode 100644 index 0000000..29e2004 --- /dev/null +++ b/src/macextras/doc/QtMacExtras/Cocoa/Cocoa.h @@ -0,0 +1 @@ +// Dummy header used in documentation build diff --git a/src/macextras/doc/QtMacExtras/CoreFoundation/CoreFoundation.h b/src/macextras/doc/QtMacExtras/CoreFoundation/CoreFoundation.h new file mode 100644 index 0000000..29e2004 --- /dev/null +++ b/src/macextras/doc/QtMacExtras/CoreFoundation/CoreFoundation.h @@ -0,0 +1 @@ +// Dummy header used in documentation build diff --git a/src/macextras/doc/qtmacextras.qdocconf b/src/macextras/doc/qtmacextras.qdocconf index b9a9d77..6c02ada 100644 --- a/src/macextras/doc/qtmacextras.qdocconf +++ b/src/macextras/doc/qtmacextras.qdocconf @@ -1,4 +1,5 @@ include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) +include($QT_INSTALL_DOCS/config/exampleurl-qtmacextras.qdocconf) project = QtMacExtras description = Qt Mac Extras Reference Documentation |