diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-07-17 01:00:27 +0200 |
---|---|---|
committer | Edward Welbourne <edward.welbourne@qt.io> | 2019-07-17 10:44:21 +0200 |
commit | 64df0eda36fea91b71783b23bfdf733b6983c250 (patch) | |
tree | 92cbd069b534a873a33a46c7735592eaca78d9cd /src/widgets/doc | |
parent | 8b34296e6a86ce5ad9dba6ac54c84a64cec09b96 (diff) | |
parent | a837ec15fec100567730a7bedb06655ef891ac96 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Conflicts:
src/corelib/global/qlogging.cpp
src/gui/painting/qtextureglyphcache_p.h
src/gui/text/qfontengine.cpp
src/widgets/widgets/qlineedit.cpp
Change-Id: Ic8798538df466b7141caa8bbf1fb7605eb56be37
Diffstat (limited to 'src/widgets/doc')
-rw-r--r-- | src/widgets/doc/macOS/AppKit/AppKit.h | 1 | ||||
-rw-r--r-- | src/widgets/doc/qtwidgets.qdocconf | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/widgets/doc/macOS/AppKit/AppKit.h b/src/widgets/doc/macOS/AppKit/AppKit.h new file mode 100644 index 0000000000..29e2004423 --- /dev/null +++ b/src/widgets/doc/macOS/AppKit/AppKit.h @@ -0,0 +1 @@ +// Dummy header used in documentation build diff --git a/src/widgets/doc/qtwidgets.qdocconf b/src/widgets/doc/qtwidgets.qdocconf index 6e04372a8b..548224bf61 100644 --- a/src/widgets/doc/qtwidgets.qdocconf +++ b/src/widgets/doc/qtwidgets.qdocconf @@ -5,6 +5,9 @@ project = QtWidgets description = Qt Widgets Reference Documentation version = $QT_VERSION +# dummy macOS headers for generating docs under non-mac platforms +includepaths += -I./macOS + examplesinstallpath = widgets qhp.projects = QtWidgets |