From 919dd97e835f469609a0710eb91f829a6d70e88c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Wed, 10 Feb 2021 12:02:57 +0100 Subject: Fix 'WebEngine' ambiguity for Qt6 'WebEngine' is a qml module, however name itself is ambiguous. Thefore now with Qt6 and with cmake port name the module as WebEngineQuick. Change-Id: I948672dd5d389a01c6a31ec871459164fd989c0f Reviewed-by: Allan Sandfeld Jensen --- src/webengine/doc/qtwebengine.qdocconf | 90 ---------------------------------- 1 file changed, 90 deletions(-) delete mode 100644 src/webengine/doc/qtwebengine.qdocconf (limited to 'src/webengine/doc/qtwebengine.qdocconf') diff --git a/src/webengine/doc/qtwebengine.qdocconf b/src/webengine/doc/qtwebengine.qdocconf deleted file mode 100644 index be5db9c19..000000000 --- a/src/webengine/doc/qtwebengine.qdocconf +++ /dev/null @@ -1,90 +0,0 @@ -include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) -include($QT_INSTALL_DOCS/config/exampleurl-qtwebengine.qdocconf) - -project = QtWebEngine -description = Qt WebEngine Reference Documentation -version = $QT_VERSION - -qhp.projects = QtWebEngine - -qhp.QtWebEngine.file = qtwebengine.qhp -qhp.QtWebEngine.namespace = org.qt-project.qtwebengine.$QT_VERSION_TAG -qhp.QtWebEngine.virtualFolder = qtwebengine -qhp.QtWebEngine.indexTitle = Qt WebEngine -qhp.QtWebEngine.indexRoot = - -qhp.QtWebEngine.filterAttributes = qtwebengine $QT_VERSION qtrefdoc -qhp.QtWebEngine.customFilters.Qt.name = QtWebEngine $QT_VERSION -qhp.QtWebEngine.customFilters.Qt.filterAttributes = qtwebengine $QT_VERSION - -qhp.QtWebEngine.subprojects = classes qmltypes examples - -qhp.QtWebEngine.subprojects.classes.title = C++ Classes and Namespaces -qhp.QtWebEngine.subprojects.classes.indexTitle = Qt WebEngine C++ Classes and Namespaces -qhp.QtWebEngine.subprojects.classes.selectors = class group:qtwebengine-namespaces doc:headerfile -qhp.QtWebEngine.subprojects.classes.sortPages = true - -qhp.QtWebEngine.subprojects.qmltypes.title = QML Types -qhp.QtWebEngine.subprojects.qmltypes.indexTitle = Qt WebEngine QML Types -qhp.QtWebEngine.subprojects.qmltypes.selectors = qmltype -qhp.QtWebEngine.subprojects.qmltypes.sortPages = true - -qhp.QtWebEngine.subprojects.examples.title = Examples -qhp.QtWebEngine.subprojects.examples.indexTitle = Qt WebEngine Examples -qhp.QtWebEngine.subprojects.examples.selectors = doc:example -qhp.QtWebEngine.subprojects.examples.sortPages = true - -manifestmeta.highlighted.names += "QtWebEngine/WebEngine Widgets Simple Browser Example" \ - "QtWebEngine/WebEngine Quick Nano Browser" - -tagfile = ../../../doc/qtwebengine/qtwebengine.tags - -# Custom module header for clang that pulls in also QtWebEngineWidgets -moduleheader = QtWebEngineDoc - -# Additional include paths for clang -includepaths = -I . - -depends += qtcore \ - qtgui \ - qtlocation \ - qtnetwork \ - qtplatformheaders \ - qtprintsupport \ - qtpositioning \ - qtqml \ - qtquick \ - qtquickcontrols \ - qtdoc \ - qtwebchannel \ - qtwebview \ - qtwidgets - -headerdirs += .. \ - ../../core/api \ - ../../webenginewidgets/api - -sourcedirs += .. \ - ../../core/api \ - ../../core/doc \ - ../../webenginewidgets/api \ - ../../webenginewidgets/doc - -exampledirs += . \ - ../../../examples \ - snippets \ - ../../core/doc/snippets \ - ../../webenginewidgets/doc/snippets - -examples.fileextensions += *.aff *.dic *.html - -imagedirs += images - -navigation.landingpage = "Qt WebEngine" -navigation.cppclassespage = "Qt WebEngine C++ Classes and Namespaces" -navigation.qmltypespage = "Qt WebEngine QML Types" - -# \QWE macro expands to 'Qt WebEngine' without auto-linking anywhere. -macro.QWE = "Qt \\WebEngine" - -Cpp.ignoretokens += Q_WEBENGINE_EXPORT Q_WEBENGINECORE_EXPORT QWEBENGINEWIDGETS_EXPORT -- cgit v1.2.1