diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:50:46 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-09 13:50:46 +0200 |
commit | 7a3cda81ac1103afbe0224006fedd2f7f10b1ab6 (patch) | |
tree | 064bfbedb6ee6e43fd7e5d97580596b9a61ce8bb | |
parent | 36c5496ac198891eea52e5a2bb779d8ccda93e68 (diff) | |
parent | 9894e604dff2bf9fe9961b475a678938316154f1 (diff) | |
download | qttools-7a3cda81ac1103afbe0224006fedd2f7f10b1ab6.tar.gz |
Merge remote-tracking branch 'origin/5.11.0' into 5.11
Change-Id: I157112adcd7e754a2243c1aa13c75c140dbc6369
-rw-r--r-- | dist/changes-5.11.0 | 65 | ||||
-rw-r--r-- | mkspecs/features/qt_find_clang.prf | 204 | ||||
-rw-r--r-- | src/qdoc/qdoc.pro | 8 |
3 files changed, 274 insertions, 3 deletions
diff --git a/dist/changes-5.11.0 b/dist/changes-5.11.0 new file mode 100644 index 000000000..ad2d7c031 --- /dev/null +++ b/dist/changes-5.11.0 @@ -0,0 +1,65 @@ +Qt 5.11 introduces many new features and improvements as well as bugfixes +over the 5.10.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + +http://doc.qt.io/qt-5/index.html + +The Qt version 5.11 series is binary compatible with the 5.10.x series. +Applications compiled for 5.10 will continue to run with 5.11. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + +https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Qt 5.11.0 Changes * +**************************************************************************** + +Licensing +--------- + + - The Qt UI Tools library got relicensed to commercial + BSD. + +Qt Designer +----------- + + - [QTBUG-34610] Qt Designer now supports id-based translations. + +Qt Linguist +----------- + + - [QTBUG-35652] Fixed special whitespace characters getting lost. + - [QTBUG-43519] Language labels are now country-qualified when necessary. + - [QTBUG-56376] The language selection dialog now displays each country + and language in both english and the language itself. + - Language labels are now displayed in the target language itself. + - The phrase view now shows the source context of guesses. + - The maximal number of guesses in the phrase view can be changed now. + - The message count fields gained tooltips that show the number of + remaining unfinished messages. + - It is now possible to mark a message as done without jumping to the + next unfinished one. + - The search dialog now supports regular expressions. + +lupdate +------- + + - [QTBUG-67278] -tr-function-alias may now specify QML member expressions. + +lrelease +-------- + + - [QTBUG-64317][CMake] Fixed qt5_add_translation() mishandling of filenames + with multiple dots. + - [QTBUG-44323][CMake] Added OPTIONS parameter to qt5_add_translation(). + +macdeployqt +----------- + + - [QTBUG-65844] Added support for selecting the file system type to use + when building a .dmg file. Defaults to HFS+ to support a wider range + of macOS versions. diff --git a/mkspecs/features/qt_find_clang.prf b/mkspecs/features/qt_find_clang.prf index 2b2538418..edcd72e83 100644 --- a/mkspecs/features/qt_find_clang.prf +++ b/mkspecs/features/qt_find_clang.prf @@ -40,6 +40,13 @@ defineReplace(findLLVMVersionFromLibDir) { } for(_, $$list(_)) { # just a way to break easily + isEmpty(FORCE_MINGW_QDOC_BUILD): FORCE_MINGW_QDOC_BUILD = $$(FORCE_MINGW_QDOC_BUILD) + equals(QMAKE_HOST.os, Windows):gcc:isEmpty(FORCE_MINGW_QDOC_BUILD) { + log("QDoc build is disabled on MinGW in Qt 5.11.0, because of a missing feature in the release infrastructure.") + log("You can enable it by setting FORCE_MINGW_QDOC_BUILD") + break() + } + isEmpty(LLVM_INSTALL_DIR): LLVM_INSTALL_DIR = $$(LLVM_INSTALL_DIR) LLVM_INSTALL_DIR = $$clean_path($$LLVM_INSTALL_DIR) contains(QMAKE_HOST.arch, x86_64): \ @@ -83,9 +90,200 @@ for(_, $$list(_)) { # just a way to break easily !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR): CLANG_LIBS = -L$${CLANG_LIBDIR} equals(QMAKE_HOST.os, Windows): \ - CLANG_LIBS += -llibclang -ladvapi32 -lshell32 - else: \ - CLANG_LIBS += -lclang + CLANG_LIBS += -llibclang_static -ladvapi32 -lshell32 -lMincore + else: { + !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--start-group + CLANG_LIBS += -lclangAnalysis \ + -lclangApplyReplacements \ + -lclangARCMigrate \ + -lclangAST \ + -lclangASTMatchers \ + -lclangBasic \ + -lclangChangeNamespace \ + -lclangCodeGen \ + -lclangCrossTU \ + -lclangDaemon \ + -lclangDriver \ + -lclangDynamicASTMatchers \ + -lclangEdit \ + -lclangFormat \ + -lclangFrontend \ + -lclangFrontendTool \ + -lclangHandleCXX \ + -lclangIncludeFixer \ + -lclangIncludeFixerPlugin \ + -lclangIndex \ + -lclangLex \ + -lclangMove \ + -lclangParse \ + -lclangQuery \ + -lclangReorderFields \ + -lclangRewrite \ + -lclangRewriteFrontend \ + -lclangSema \ + -lclangSerialization \ + -lclang_static \ + -lclangStaticAnalyzerCheckers \ + -lclangStaticAnalyzerCore \ + -lclangStaticAnalyzerFrontend \ + -lclangTidy \ + -lclangTidyAndroidModule \ + -lclangTidyBoostModule \ + -lclangTidyBugproneModule \ + -lclangTidyCERTModule \ + -lclangTidyCppCoreGuidelinesModule \ + -lclangTidyFuchsiaModule \ + -lclangTidyGoogleModule \ + -lclangTidyHICPPModule \ + -lclangTidyLLVMModule \ + -lclangTidyMiscModule \ + -lclangTidyModernizeModule \ + -lclangTidyMPIModule \ + -lclangTidyObjCModule \ + -lclangTidyPerformanceModule \ + -lclangTidyPlugin \ + -lclangTidyReadabilityModule \ + -lclangTidyUtils \ + -lclangTooling \ + -lclangToolingASTDiff \ + -lclangToolingCore \ + -lclangToolingRefactor \ + -lfindAllSymbols \ + -lLLVMAArch64AsmParser \ + -lLLVMAArch64AsmPrinter \ + -lLLVMAArch64CodeGen \ + -lLLVMAArch64Desc \ + -lLLVMAArch64Disassembler \ + -lLLVMAArch64Info \ + -lLLVMAArch64Utils \ + -lLLVMAMDGPUAsmParser \ + -lLLVMAMDGPUAsmPrinter \ + -lLLVMAMDGPUCodeGen \ + -lLLVMAMDGPUDesc \ + -lLLVMAMDGPUDisassembler \ + -lLLVMAMDGPUInfo \ + -lLLVMAMDGPUUtils \ + -lLLVMAnalysis \ + -lLLVMARMAsmParser \ + -lLLVMARMAsmPrinter \ + -lLLVMARMCodeGen \ + -lLLVMARMDesc \ + -lLLVMARMDisassembler \ + -lLLVMARMInfo \ + -lLLVMARMUtils \ + -lLLVMAsmParser \ + -lLLVMAsmPrinter \ + -lLLVMBinaryFormat \ + -lLLVMBitReader \ + -lLLVMBitWriter \ + -lLLVMBPFAsmParser \ + -lLLVMBPFAsmPrinter \ + -lLLVMBPFCodeGen \ + -lLLVMBPFDesc \ + -lLLVMBPFDisassembler \ + -lLLVMBPFInfo \ + -lLLVMCodeGen \ + -lLLVMCore \ + -lLLVMCoroutines \ + -lLLVMCoverage \ + -lLLVMDebugInfoCodeView \ + -lLLVMDebugInfoDWARF \ + -lLLVMDebugInfoMSF \ + -lLLVMDebugInfoPDB \ + -lLLVMDemangle \ + -lLLVMDlltoolDriver \ + -lLLVMExecutionEngine \ + -lLLVMFuzzMutate \ + -lLLVMGlobalISel \ + -lLLVMHexagonAsmParser \ + -lLLVMHexagonCodeGen \ + -lLLVMHexagonDesc \ + -lLLVMHexagonDisassembler \ + -lLLVMHexagonInfo \ + -lLLVMInstCombine \ + -lLLVMInstrumentation \ + -lLLVMInterpreter \ + -lLLVMipo \ + -lLLVMIRReader \ + -lLLVMLanaiAsmParser \ + -lLLVMLanaiAsmPrinter \ + -lLLVMLanaiCodeGen \ + -lLLVMLanaiDesc \ + -lLLVMLanaiDisassembler \ + -lLLVMLanaiInfo \ + -lLLVMLibDriver \ + -lLLVMLineEditor \ + -lLLVMLinker \ + -lLLVMLTO \ + -lLLVMMC \ + -lLLVMMCDisassembler \ + -lLLVMMCJIT \ + -lLLVMMCParser \ + -lLLVMMipsAsmParser \ + -lLLVMMipsAsmPrinter \ + -lLLVMMipsCodeGen \ + -lLLVMMipsDesc \ + -lLLVMMipsDisassembler \ + -lLLVMMipsInfo \ + -lLLVMMIRParser \ + -lLLVMMSP430AsmPrinter \ + -lLLVMMSP430CodeGen \ + -lLLVMMSP430Desc \ + -lLLVMMSP430Info \ + -lLLVMNVPTXAsmPrinter \ + -lLLVMNVPTXCodeGen \ + -lLLVMNVPTXDesc \ + -lLLVMNVPTXInfo \ + -lLLVMObjCARCOpts \ + -lLLVMObject \ + -lLLVMObjectYAML \ + -lLLVMOption \ + -lLLVMOrcJIT \ + -lLLVMPasses \ + -lLLVMPowerPCAsmParser \ + -lLLVMPowerPCAsmPrinter \ + -lLLVMPowerPCCodeGen \ + -lLLVMPowerPCDesc \ + -lLLVMPowerPCDisassembler \ + -lLLVMPowerPCInfo \ + -lLLVMProfileData \ + -lLLVMRuntimeDyld \ + -lLLVMScalarOpts \ + -lLLVMSelectionDAG \ + -lLLVMSparcAsmParser \ + -lLLVMSparcAsmPrinter \ + -lLLVMSparcCodeGen \ + -lLLVMSparcDesc \ + -lLLVMSparcDisassembler \ + -lLLVMSparcInfo \ + -lLLVMSupport \ + -lLLVMSymbolize \ + -lLLVMSystemZAsmParser \ + -lLLVMSystemZAsmPrinter \ + -lLLVMSystemZCodeGen \ + -lLLVMSystemZDesc \ + -lLLVMSystemZDisassembler \ + -lLLVMSystemZInfo \ + -lLLVMTableGen \ + -lLLVMTarget \ + -lLLVMTransformUtils \ + -lLLVMVectorize \ + -lLLVMWindowsManifest \ + -lLLVMX86AsmParser \ + -lLLVMX86AsmPrinter \ + -lLLVMX86CodeGen \ + -lLLVMX86Desc \ + -lLLVMX86Disassembler \ + -lLLVMX86Info \ + -lLLVMX86Utils \ + -lLLVMXCoreAsmPrinter \ + -lLLVMXCoreCodeGen \ + -lLLVMXCoreDesc \ + -lLLVMXCoreDisassembler \ + -lLLVMXCoreInfo \ + -lLLVMXRay + !equals(QMAKE_HOST.os, Darwin): CLANG_LIBS+=-Wl,--end-group + } !versionIsAtLeast($$CLANG_VERSION, "3.9.0") { log("LLVM/Clang version >= 3.9.0 required, version provided: $${CLANG_VERSION}.$$escape_expand(\\n)") diff --git a/src/qdoc/qdoc.pro b/src/qdoc/qdoc.pro index e3b431aa9..1475a441d 100644 --- a/src/qdoc/qdoc.pro +++ b/src/qdoc/qdoc.pro @@ -14,6 +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 +} + !contains(QMAKE_DEFAULT_LIBDIRS, $$CLANG_LIBDIR):!disable_external_rpath: QMAKE_RPATHDIR += $$CLANG_LIBDIR DEFINES += $$shell_quote(CLANG_RESOURCE_DIR=\"$${CLANG_LIBDIR}/clang/$${CLANG_VERSION}/include\") |