diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-18 11:24:02 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-18 11:24:02 +0200 |
| commit | f767d707397341ed9175a3c9d7f57175fb2a8d96 (patch) | |
| tree | ca85ee1b21e10465283393782bf4a31a6178ea7e /src | |
| parent | 7a3cda81ac1103afbe0224006fedd2f7f10b1ab6 (diff) | |
| parent | a42d3f2ac4b910ecc910ff144191cb729a745c9a (diff) | |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: Ib45be3626278d9bac03ff0b8f8ab0487ada2d206
Diffstat (limited to 'src')
| -rw-r--r-- | src/qdoc/qdoc.pro | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/qdoc/qdoc.pro b/src/qdoc/qdoc.pro index 1475a441d..b35897c26 100644 --- a/src/qdoc/qdoc.pro +++ b/src/qdoc/qdoc.pro @@ -14,12 +14,14 @@ qtHaveModule(qmldevtools-private) { LIBS += $$CLANG_LIBS !contains(QMAKE_DEFAULT_INCDIRS, $$CLANG_INCLUDEPATH): INCLUDEPATH += $$CLANG_INCLUDEPATH -# Support static libclang linking on different platforms -equals(QMAKE_HOST.os, Windows): { - DEFINES += CINDEX_LINKAGE= -} else { - LIBS += -lz -ldl - equals(QMAKE_HOST.os, Darwin): LIBS += -lcurses -lm -lxml2 +!isEmpty(QDOC_USE_STATIC_LIBCLANG) { + # Support static libclang linking on different platforms + equals(QMAKE_HOST.os, Windows) { + DEFINES += CINDEX_LINKAGE= + } else { + LIBS += -lz -ldl + equals(QMAKE_HOST.os, Darwin): LIBS += -lcurses -lm -lxml2 + } } !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR):!disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR |