diff -r 93b982ccede2 -r 5daf16870df6 tools/qdoc3/test/qt-defines.qdocconf
--- a/tools/qdoc3/test/qt-defines.qdocconf	Mon Jun 21 22:38:13 2010 +0100
+++ b/tools/qdoc3/test/qt-defines.qdocconf	Thu Jul 22 16:41:55 2010 +0100
@@ -3,6 +3,7 @@
                           QT_.*_LIB \
                           QT_COMPAT \
                           QT_KEYPAD_NAVIGATION \
+			  QT_NO_EGL \
                           QT3_SUPPORT \
                           Q_WS_.* \
                           Q_OS_.* \
@@ -19,8 +20,33 @@
 # See also qhp.Qt.extraFiles
 extraimages.HTML        = qt-logo \
                           trolltech-logo \
+			  bg_l.png \
+                          bg_l_blank.png \
+                          bg_r.png \
+			  box_bg.png \
+			  breadcrumb.png \
+			  bullet_gt.png \
+                          bullet_dn.png \
+			  bullet_sq.png \
+                          bullet_up.png \
+                          feedbackground.png \
+                          horBar.png \
+			  page.png \
+			  page_bg.png \
+			  sprites-combined.png \
                           taskmenuextension-example.png \
                           coloreditorfactoryimage.png \
                           dynamiclayouts-example.png \
                           stylesheet-coffee-plastique.png
-                             
\ No newline at end of file
+
+# This stuff is used by the new doc format.
+scriptdirs              = $QT_SOURCE_TREE/doc/src/template/scripts
+styledirs               = $QT_SOURCE_TREE/doc/src/template/style
+
+scripts.HTML		= functions.js \
+			  jquery.js
+
+styles.HTML		= style.css \
+			  style_ie6.css \
+			  style_ie7.css \
+			  style_ie8.css