diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-10 03:03:00 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-11-10 03:03:00 +0100 |
| commit | d0f61f323915321feecbafe82c503175efbd62ea (patch) | |
| tree | 5e27ae8510c552b2da3ba6a86a27a8521870c4ad | |
| parent | e559dcf98727d765efc167e3be9f1ab0f3992a4f (diff) | |
| parent | 6259f255228f04e8936c73c0db042d6201c13bc4 (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I9f867fd0414eb3079c2f4c314275149a7437922b
| -rw-r--r-- | src/macextras/doc/qtmacextras.qdocconf | 3 | ||||
| -rw-r--r-- | src/src.pro | 1 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/macextras/doc/qtmacextras.qdocconf b/src/macextras/doc/qtmacextras.qdocconf index 7bb599f..b9a9d77 100644 --- a/src/macextras/doc/qtmacextras.qdocconf +++ b/src/macextras/doc/qtmacextras.qdocconf @@ -18,8 +18,7 @@ moduleheader = QtMacExtrasDoc # pass include paths to clang includepaths += -I . \ -I .. \ - -I ./QtMacExtras \ - -I $QT_INSTALL_HEADERS + -I ./QtMacExtras clangdefines += Q_OS_OSX Q_OS_MACOS QT_PLATFORM_UIKIT diff --git a/src/src.pro b/src/src.pro index fd1ffb1..1993687 100644 --- a/src/src.pro +++ b/src/src.pro @@ -5,5 +5,6 @@ mac { else { # fake project for creating the documentation TEMPLATE = aux + CONFIG += force_qt QMAKE_DOCS = $$PWD/macextras/doc/qtmacextras.qdocconf } |