From 3247a8f30ef1aa26fefc5d8b8f81f35567bf0071 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 1 Jul 2019 16:02:31 +0200 Subject: Bump version Change-Id: Icbaaf7801b958531e4b4d9e1ffb47a8d34f4db7a --- .qmake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.qmake.conf b/.qmake.conf index d01fb79..5e39f5a 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -2,4 +2,4 @@ load(qt_build_config) DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.12.4 +MODULE_VERSION = 5.12.5 -- cgit v1.2.3 From dbc3f50ae7cb9cc2c3f0b5689441bf269cfed01d Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Wed, 3 Jul 2019 11:49:17 +0200 Subject: Doc: Replace example file lists with links to code.qt.io Task-number: QTBUG-74391 Change-Id: I9d8185a4e9e6d566f18c47409cda3d6cb5484f98 Reviewed-by: Paul Wicking --- src/macextras/doc/qtmacextras.qdocconf | 1 + 1 file changed, 1 insertion(+) 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 -- cgit v1.2.3 From f44061fa0547d048661d1efa8444da7c757fa39c Mon Sep 17 00:00:00 2001 From: Topi Reinio Date: Thu, 11 Jul 2019 20:13:04 +0200 Subject: Doc: Ensure macOS-specific class docs are generated on other platforms The Clang parser in QDoc fails to parse the .mm source files if their include files are not found. Add dummy header files under the /doc/QtMacExtras directory for this purpose. Fixes: QTBUG-77009 Change-Id: I2ec5a9aadb541a52b0416f79ca30321b55b0b8cc Reviewed-by: Paul Wicking --- src/macextras/doc/QtMacExtras/AppKit/AppKit.h | 1 + src/macextras/doc/QtMacExtras/Cocoa/Cocoa.h | 1 + src/macextras/doc/QtMacExtras/CoreFoundation/CoreFoundation.h | 1 + 3 files changed, 3 insertions(+) create mode 100644 src/macextras/doc/QtMacExtras/AppKit/AppKit.h create mode 100644 src/macextras/doc/QtMacExtras/Cocoa/Cocoa.h create mode 100644 src/macextras/doc/QtMacExtras/CoreFoundation/CoreFoundation.h 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 -- cgit v1.2.3