Mercurial > vanilla

annotate qt/qttools/patch-qdoc.patch @ 1221:a47aaf9743a0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
misc: backed out changeset 4ccc42bf0284 We will keep .sh for now.
author David Demelier <markand@malikania.fr>
date Fri, 15 Oct 2021 16:07:30 +0200
parents bebbfcce62c5
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
685
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
1 --- src/qdoc/qdoc.pro.orig 2019-08-01 03:10:40.883237060 +0000
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
2 +++ src/qdoc/qdoc.pro 2019-08-01 03:11:10.695237975 +0000
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
3 @@ -14,11 +14,10 @@
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
4 include($$OUT_PWD/qtqdoc-config.pri)
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
5
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
6 LIBS += $$CLANG_LIBS
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
7 -!contains(QMAKE_DEFAULT_INCDIRS, $$CLANG_INCLUDEPATH): INCLUDEPATH += $$CLANG_INCLUDEPATH
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
8 DEFINES += $$CLANG_DEFINES
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
9
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
10 !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR):!disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
11 -DEFINES += $$shell_quote(CLANG_RESOURCE_DIR=\"$${CLANG_LIBDIR}/clang/$${CLANG_VERSION}/include\")
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
12 +DEFINES += $$shell_quote(CLANG_RESOURCE_DIR=\"/include\")
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
13
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
14 DEFINES += \
bebbfcce62c5 qt/qttools: initial import, closes #1520
David Demelier <markand@malikania.fr>
parents:
diff changeset
15 QDOC2_COMPAT