feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge remote-tracking branch 'origin/5.0'

Browse Source 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/android/androidconfigurations.cpp

Change-Id: Icd2b0fda2b2653656285bbbe457c30c9cd414d3f
This commit is contained in:
Eike Ziller
2021-08-30 10:53:27 +02:00
parent c145f95952 263d8fb5d7
commit 987ad3fe9c
44 changed files with 263 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/help/CMakeLists.txt
View File

@@ -57,7 +57,7 @@ endif ()
option(BUILD_HELPVIEWERBACKEND_QTWEBENGINE "Build QtWebEngine based help viewer backend." ${BUILD_HELPVIEWERBACKEND_QTWEBENGINE_DEFAULT})
find_package(Qt5 COMPONENTS WebEngineWidgets QUIET)
extend_qtc_plugin(Help
CONDITION BUILD_HELVIEWERBACKEND_QTWEBENGINE AND TARGET Qt5::WebEngineWidgets
CONDITION BUILD_HELPVIEWERBACKEND_QTWEBENGINE AND TARGET Qt5::WebEngineWidgets
FEATURE_INFO "QtWebEngine help viewer"
DEPENDS Qt5::WebEngineWidgets
DEFINES QTC_WEBENGINE_HELPVIEWER