Commit Graph

8 Commits

Author SHA1 Message Date
Eike Ziller
8c4d86d174 Fix Qt Creator manual style when generating with Qt 5.
The HTML.templatedir is no longer used in Qt 5. Instead, the files
are resolved relative to the referencing qdocconf.
So we set the templatedir to the path of the qdocconf (for Qt 4)
and change the references to be relative to that path.
Also, it's HTML.extraimages in Qt 5, instead of extraimages.HTML

Task-number: QTBUG-28304
Change-Id: I5b253ea9fac5825c49f74460df188a7fca5c89cd
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
2012-12-10 13:42:15 +01:00
Eike Ziller
9092e70884 Merge remote-tracking branch 'origin/2.5'
Conflicts:
	doc/templates/style/style.css
	qtcreator.pri

Change-Id: I5f4f5f191726883dae18cb760733a5e8e6bd4e7d
2012-04-27 17:02:39 +02:00
Leena Miettinen
56ed79050b Doc: add green icons for next and previous topics
For the online style, now that the text is removed

Change-Id: I13b7da504abda0b395e25dbf6e6ec4bcf03f4ec8
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-04-27 11:47:12 +02:00
Casper van Donderen
8316cbe3f4 Doc: Add icons for previous and next page.
Change-Id: Ic0f9836d9af2f9c683171a6cbdfd6e42ba1fe2a3
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>
2012-04-20 12:20:11 +02:00
David Boddie
fae31e0d25 Doc: Added a missing image, removed unnecessary search field. 2011-02-16 18:38:16 +01:00
David Boddie
42f742b858 Doc: Ensured that style and scripts are included in online docs. 2011-02-16 14:54:02 +01:00
Leena Miettinen
70b9c84381 Doc: fix for the online style 2011-02-15 15:57:47 +01:00
David Boddie
a20cd34863 Updated the configuration files to use the updated qdoc.
Updated qdoc to remove hard-coded dependencies on style sheets.
Simplified the offline documentation, introducing an offline.css
file to be used for documentation in Qt Creator.
2011-02-11 08:40:55 +01:00