Doc: Fixed qdocconf merge issue

-qtdoc-project.qdocconf was removed in d4359e but git
 brought it back during a merge.
-Added 'qmake' in the depends because the merge didn't merge
 the change to the new file.

Change-Id: Iddcce47186c09d1799ed236878b72455ac62c3fe
Reviewed-by: Martin Smith <martin.smith@digia.com>

doc/config/qtdoc-project.qdocconf

@@ -1,71 +0,0 @@
-project                 = QtDoc
-description             = Qt Reference Documentation
-url                     = http://qt-project.org/doc/qt-$QT_VER/qtdoc
-version                 = $QT_VERSION
-
-depends += \
-    activeqt \
-    qmake \
-    qtassistant \
-    qt3d \
-    qtbluetooth \
-    qtconcurrent \
-    qtcontacts \
-    qtcore \
-    qtdbus \
-    qtdesigner \
-    qtfeedback \
-    qtgraphicaleffects \
-    qthelp \
-    qtimageformats \
-    qtgui \
-    qtlocation \
-    qtlinguist \
-    qtmultimedia \
-    qtmultimediawidgets \
-    qtnetwork \
-    qtnfc \
-    qtopengl \
-    qtorganizer \
-    qtprintsupport \
-    qtpublishsubscribe \
-    qtqml \
-    qtquick \
-    qtquickcontrols \
-    qtquickcontrolsstyles \
-    qtquickdialogs \
-    qtquicklayouts \
-    qtscript \
-    qtscripttools \
-    qtsensors \
-    qtserialport \
-    qtserviceframework \
-    qtsql \
-    qtsvg \
-    qtsysteminfo \
-    qttestlib \
-    qttools \
-    qtuitools \
-    qtversit \
-    qtwidgets \
-    qtwebkit \
-    qtwebkitexamples \
-    qtwinextras \
-    qtx11extras \
-    qtxml \
-    qtxmlpatterns
-
-headerdirs  += ../src
-imagedirs   += ../src/images \
-               ../images
-
-sourcedirs  += \
-    ../src
-
-exampledirs += \
-    ../src \
-    ../snippets
-
-# Don't parse files in snippets directory
-excludedirs += \
-    ../src/snippets

doc/config/qtdoc.qdocconf

@@ -8,6 +8,7 @@ version                 = $QT_VERSION
 
 depends += \
     activeqt \
+    qmake \
     qtassistant \
     qt3d \
     qtbluetooth \