1 files changed, 7 insertions, 14 deletions
diff --git a/src/qdoc/doc/config/qdoc.qdocconf b/src/qdoc/doc/config/qdoc.qdocconf
index 30a5cb13d..cadc49e5d 100644
--- a/src/qdoc/doc/config/qdoc.qdocconf
+++ b/src/qdoc/doc/config/qdoc.qdocconf
@@ -7,13 +7,10 @@ version          = $QT_VERSION
 sourcedirs = ..
 
 exampledirs = .. \
-              ../examples \
-              ../../../../../qtbase/src/gui/doc/
+              ../examples
 
 imagedirs = ../images \
-            ../../../../widgets/doc/images \
-            ../../../../../qtbase/src/widgets/doc/images/
-#            ../../../doc/src/templates/images
+            ../../../../../qtbase/src/widgets/doc/images
 
 tagfile = ../html/qdoc.tags
 
@@ -27,20 +24,20 @@ qhp.QDoc.virtualFolder       = qdoc
 qhp.QDoc.indexTitle          = QDoc Manual
 qhp.QDoc.indexRoot           =
 
-qhp.QDoc.filterAttributes    = qdoc qtrefdoc
-qhp.QDoc.customFilters.QDoc.name = QDoc
-qhp.QDoc.customFilters.QDoc.filterAttributes = qdoc
+qhp.QDoc.filterAttributes    = qdoc $QT_VERSION qtrefdoc
+qhp.QDoc.customFilters.QDoc.name = QDoc $QT_VERSION
+qhp.QDoc.customFilters.QDoc.filterAttributes = qdoc $QT_VERSION
+
 qhp.QDoc.subprojects         = overviews
 qhp.QDoc.subprojects.overviews.title = Overviews
 qhp.QDoc.subprojects.overviews.indexTitle = QDoc Manual
-qhp.QDoc.subprojects.overviews.selectors = fake:page,group,module
+qhp.QDoc.subprojects.overviews.selectors = doc:page
 
 depends += \
     activeqt \
     qtassistant \
     qtbluetooth \
     qtconcurrent \
-    qtcontacts \
     qtcore \
     qtdbus \
     qtdesigner \
@@ -53,7 +50,6 @@ depends += \
     qtmultimedia \
     qtnetwork \
     qtopengl \
-    qtorganizer \
     qtprintsupport \
     qtqml \
     qtquick \
@@ -64,10 +60,7 @@ depends += \
     qtsvg \
     qttestlib \
     qtuitools \
-    qtversit \
     qtwidgets \
-    qtwebkit \
-    qtwebkitexamples \
     qtxml \
     qtxmlpatterns