summaryrefslogtreecommitdiffstats
path: root/doc/doc.pri
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-10-191-5/+1
|\ | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/s60installs/qt.iby util/qlalr/cppgenerator.cpp
| * build: Removed alternative definition for ADP_DOCS_QDOCCONF_FILEMartin Smith2009-10-161-5/+1
| | | | | | | | It used a qdocconf file that no longer exists; something for xcode.
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-09-291-1/+1
|\ \ | |/ | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe mkspecs/features/qt.prf
| * Remove distinction between different editions in docs.Jason McDonald2009-09-221-1/+1
| | | | | | | | | | | | | | We now generate only one set of docs, for the qt-everywhere package. Thus we no longer need to differentiate the different editions. Reviewed-by: Trust Me
* | Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-08-251-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure configure.exe mkspecs/features/qt.prf tools/configure/configureapp.cpp
| * move qdoc3 binary to bin, so we can use it for Qt Creator without hacks.Daniel Molkentin2009-08-211-2/+2
| | | | | | | | | | | | | | Most Linux distributions already move qdoc3 to that place for exactly this reason anyway. Reviewed-by: Marius Storm-Olsen <marius@trolltech.com>
* | Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into ↵Michael Brasser2009-07-021-9/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | kinetic-declarativeui Conflicts: configure.exe src/gui/kernel/qevent.cpp src/gui/kernel/qevent_p.h tools/qdoc3/codemarker.cpp tools/qdoc3/cppcodemarker.cpp tools/qdoc3/generator.cpp
| * Make "make docs" in QTDIR work on Windows, independent of configure ↵Volker Hilsheimer2009-07-011-9/+2
| | | | | | | | | | | | | | | | | | -debug/release/debug_and_release - build qdoc3 always into tools\qdoc3 rathern than release/debug subdirs - call it from there Reviewed-by: Marius SO
* | Improve QML documentation viewing in Assistant.Michael Brasser2009-05-051-2/+3
|/ | | | | The element pages now load correctly. A separate QML 'book' is also generated, which will be targeted at non-C++ programmers.
* use qdoc3 debug version only when it is availableJoerg Bornemann2009-04-231-1/+1
| | | | | | | By default there is no debug version built of qdoc3. In this case we should call the release build. Reviewed-by: kh
* don't create double backslash in qdoc3 command on WindowsJoerg Bornemann2009-04-201-1/+1
| | | | Reviewed-by: janarve
* Long live Qt 4.5!Lars Knoll2009-03-231-0/+72