Merge branch 'master' of ssh://codereview.qt-project.org/qt/qtmultimedia into newdocs

Change-Id: Idb607da32f80784d94556443be6740c6d7223411
This commit is contained in:
Jerome Pasion
2012-11-02 15:40:51 +01:00
164 changed files with 3719 additions and 327 deletions

View File

@@ -76,9 +76,4 @@ sources.fileextensions = "*.cpp *.qdoc *.mm *.qml"
HTML.nobreadcrumbs = "true"
HTML.templatedir = .
HTML.stylesheets = style/qtmultimedia.css
HTML.headerstyles = " <link rel=\"stylesheet\" type=\"text/css\" href=\"style/qtmultimedia.css\" />\n"
HTML.endheader = "</head>\n<body>\n"
HTML.footer = "<div class=\"footer\">Copyright (c) 2012 Digia Plc and/or its subsidiaries. All rights reserved.</div>\n"