diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-02 07:38:39 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-02 07:38:39 (GMT) |
| commit | 2c4a5cee336aba5f2da52ac4c59b502cf4d82164 (patch) | |
| tree | dc7857f6d2342b85099a799faafaa863fb36a516 /tools/qdoc3/test | |
| parent | 576cb12c36f24917d674f4c0bf240441b4ac9b43 (diff) | |
| parent | f101d46ccd4795fc672b5b6c9e24151df319d725 (diff) | |
| download | Qt-2c4a5cee336aba5f2da52ac4c59b502cf4d82164.zip Qt-2c4a5cee336aba5f2da52ac4c59b502cf4d82164.tar.gz Qt-2c4a5cee336aba5f2da52ac4c59b502cf4d82164.tar.bz2 | |
Merge remote branch 'origin/4.7' into qt-master-from-4.7
Diffstat (limited to 'tools/qdoc3/test')
| -rw-r--r-- | tools/qdoc3/test/qt-defines.qdocconf | 1 | ||||
| -rw-r--r-- | tools/qdoc3/test/qt-html-templates.qdocconf | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/tools/qdoc3/test/qt-defines.qdocconf b/tools/qdoc3/test/qt-defines.qdocconf index 7449ac3..0426f4d 100644 --- a/tools/qdoc3/test/qt-defines.qdocconf +++ b/tools/qdoc3/test/qt-defines.qdocconf @@ -3,6 +3,7 @@ defines = Q_QDOC \ QT_.*_LIB \ QT_COMPAT \ QT_KEYPAD_NAVIGATION \ + QT_NO_EGL \ QT3_SUPPORT \ Q_WS_.* \ Q_OS_.* \ diff --git a/tools/qdoc3/test/qt-html-templates.qdocconf b/tools/qdoc3/test/qt-html-templates.qdocconf index 01cae68..447467c 100644 --- a/tools/qdoc3/test/qt-html-templates.qdocconf +++ b/tools/qdoc3/test/qt-html-templates.qdocconf @@ -45,6 +45,7 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " <li><a href=\"modules.html\">All modules</a></li>\n" \ " <li><a href=\"classes.html\">All classes</a></li>\n" \ " <li><a href=\"functions.html\">All functions</a></li>\n" \ + " <li><a href=\"namespaces.html\">All namespaces</a></li>\n" \ " <li><a href=\"platform-specific.html\">Platform specifics</a></li>\n" \ " </ul>\n" \ " </div>\n" \ @@ -87,8 +88,9 @@ HTML.postheader = " <div class=\"header\" id=\"qtdocheader\">\n" \ " <div class=\"breadcrumb toolblock\">\n" \ " <ul>\n" \ " <li class=\"first\"><a href=\"index.html\">Home</a></li>\n" \ - " <!-- Bread crumbs goes here -->\n" \ - " </ul>\n" \ + " <!-- Bread crumbs goes here -->\n" + +HTML.postpostheader = " </ul>\n" \ " </div>\n" \ " <div class=\"toolbuttons toolblock\">\n" \ " <ul>\n" \ |