summaryrefslogtreecommitdiffstats
path: root/doc/doc.pri
Commit message (Collapse)AuthorAgeFilesLines
* qdoc: All references to -assistant and -base were removed.Martin Smith2010-08-121-1/+1
| | | | | Flags allowed are now -creator and -online. -creator is the default.
* qdoc: added application flags in doc.pri and fixed QTBUG-12388Martin Smith2010-08-051-2/+2
| | | | Task-nr: QTBUG-12388
* use "win32-g++*" scope to match all MinGW makespecsMark Brand2010-06-101-3/+3
| | | | | | | | | | | | | | The scope "win32-g++" comes from the name of the makespec. However, it is frequently used to check for MinGW. This works fine as long as win32-g++ is the only makespec for MinGW. Now we need the wildcard to cover "win32-g++-cross" as well. Also reordered test of win32 before win32-g++*. Also took opportunity to use else. Merge-request: 2407 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
* * Add Japanese tutorial documentsTakumi ASAKI2010-06-071-1/+10
| | | | * Add Japanese hellotr example
* Merge remote branch 'origin/4.6' into 4.7-from-4.6Rohan McGovern2010-05-191-2/+2
|\
| * qmake: added possibility to specify the type of an install targetJoerg Bornemann2010-05-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change: target.CONFIG+=no_check_exist implies the file is a file, no way to make an install rule for a non-existing directory. Now, its possible to specify the type: target.CONFIG+=no_check_exist directory will install a directory. target.CONFIG+=no_check_exist executable will install an executable. target.CONFIG+=no_check_exist data will install a normal file. The default case, if no type is given, like in CONFIG+=no_check_exist will call QFileInfo::isExecutable() to determine, if its a data file or executable. This is the old behaviour. Task-number: QTBUG-10624 Reviewed-by: ossi
* | Allow building documentation without all of QtDenis Dzyubenko2010-03-041-4/+7
| | | | | | | | | | | | | | | | | | added a new make target 'sub-qdoc3' which builds qdoc3 and it's dependencies only, so that when running "make docs" we don't build all of sub-tools (including declarative module), but qdoc3 only Reviewed-by: David Boddie Reviewed-by: Joao
* | Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵Warwick Allison2010-02-241-1/+1
| | | | | | | | QDeclarativeXXX.
* | Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵Qt Continuous Integration System2010-02-121-1/+10
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (27 commits) Fix QRegion under Mac OS X. update according to Thiago's comments. Changes: add functionality for dbus auto start to qt Add license header to this file readdir64 is not available on HP-UX Fix bug in QDirPrivate::setPath, affecting QDir::cd, cdUp and setPath qdoc3: Completed handling of the new \pagekeywords command. Wrong cursor shown by the parent window after setOverrideCursor(). Fixed Mac OS X compile time error by using GLint for temp. qdoc3: Added curly braces in switch statement for braindead compiler. qdoc: Added a build rule for the documentation - disabled by default. Doc: Added the qdoc manual to the repository for future maintenance. qdoc3: Fixed bug in creation of qt.pageindex. qdoc3: Added capability to create qt.pageindex. Incorrect property setter generated by dumpcpp for Microsoft Word 2007. Cocoa: Implement our own NSApplication subclass Cocoa: Menu in menubar stays highlighted qdoc: Made a temporary fix for comment highlighting. Doc: Tidied up the class layout and removed an unnecessary image. Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars. ...
| * | Doc: Added Simplified Chinese documents and build rules for them.David Boddie2010-02-041-1/+10
| |/ | | | | | | | | | | | | Also updated qdoc's configuration reader so that we can put UTF-8 content in the .qdocconf files later. Reviewed-by: Trust Me
* | Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeuiMichael Brasser2009-12-071-4/+1
|\ \ | |/
| * make qdoc3 a proper tools subtarget and install itOswald Buddenhagen2009-12-041-4/+1
| | | | | | | | | | | | needed for building qtmobility and qtcreator docs without magic. Reviewed-by: Daniel Molkentin
* | 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
generated by cgit v0.12 at 2024-08-23 18:37:53 (GMT)