Commit Graph

3 Commits

Author SHA1 Message Date
Tor Arne Vestbø a305423c92 Make the qtdoc repo part of the modularized build
The monolithic build is now partially removed, but there's still a lot
of cruft left that we'll remove once we know what we need or not need.

This introduces a bunch of qdoc warnings for examplee documentation that
live in the qdoc repo, but that references an example that lives in the
module. These example docs should be moved to the corresponding module.

Change-Id: I15f9f9087f1e96786ce2a49a7192f1015cb192db
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
2012-10-16 12:54:28 +02:00
Oswald Buddenhagen 4b35c71915 clean up determination of build root
use the new $$shadowed() function instead of the arcane trickery.

Change-Id: I4e1db28c71559c0ce9708e5a743f44bed24910fc
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Mark Brand <mabrand@mabrand.nl>
Reviewed-by: Casper van Donderen <casper.vandonderen@nokia.com>
2012-06-28 10:56:18 +02:00
Lincoln Ramsay 99b68bc259 Run qmake at "make docs" time
doc.pri requires QT.xxx.variable variables but they are not set
the first (and normally only) time qmake parses doc.pri. As a
result, you can't build docs without first manually running
"make qmake".

This change adds an explicit dependency such that all of the doc
commands (docs, online_docs, qch_docs, dita_docs) first force
qmake to run and process doc.pri again. This ensures that the
QT.xxx.variable variables have the appropriate values.

Change-Id: I688c432284605e9f56e7597f564f1c50e972f059
Reviewed-on: http://codereview.qt-project.org/5779
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Alex <alex.blasche@nokia.com>
2011-10-03 06:31:22 +02:00