Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

	Commit message (Collapse)	Author	Age	Files	Lines
*	qdoc: List new QML elements in \sincelist for What's New page.	Martin Smith	2010-02-22	2	-2/+28
\|
*	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1	David Boddie	2010-02-19	6	-35/+44
\|\
\| *	qdoc: Finished "Inherited by" list for QML elements.	Martin Smith	2010-02-19	6	-35/+44
\| \| \| \| \| \| \| \| \| \| \| \|	The listed elements are now links. Task: QTBUG-8153
* \|	Doc: Simplified Commercial Editions for Qt 4.7.	David Boddie	2010-02-19	6	-52/+0
\|/ \| \| \| \|	Reviewed-by: Trust Me Requested-by: Sales and Legal
*	qdoc: Added "Inherited by" list to QML elements.	Martin Smith	2010-02-18	5	-10/+76
\| \| \| \| \| \|	But the listed elements are not links yet, just plain text. Task: QTBUG-8153
*	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-02-12	45	-128/+9855
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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. ...
\| *	Add license header to this file	Thiago Macieira	2010-02-12	1	-0/+41
\| \|
\| *	qdoc3: Completed handling of the new \pagekeywords command.	Martin Smith	2010-02-11	2	-2/+11
\| \| \| \| \| \| \| \|	Task: QTBUG-7877
\| *	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1	Martin Smith	2010-02-11	34	-104/+9587
\| \|\
\| \| *	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1	David Boddie	2010-02-10	15	-23/+202
\| \| \|\
\| \| * \|	qdoc: Added a build rule for the documentation - disabled by default.	David Boddie	2010-02-10	1	-0/+21
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \|	Doc: Added the qdoc manual to the repository for future maintenance.	David Boddie	2010-02-10	14	-0/+9262
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \|	qdoc: Made a temporary fix for comment highlighting.	David Boddie	2010-02-09	1	-8/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \|	Doc/qdoc: Use Chinese titles; canonicalize titles with non-ASCII chars.	David Boddie	2010-02-08	2	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The documentation root in the qdocconf file now refers to the Chinese title for the Tutorials page. Modified qdoc's function to canonicalize titles so that it preserves characters that outside the range of ASCII letters and numbers. Reviewed-by: Trust Me
\| \| * \|	Doc/qdoc: Converted encoding of ISO-8859-1 docs to UTF-8. Output UTF-8.	David Boddie	2010-02-08	2	-4/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	We now write UTF-8 encoded XHTML and assume all pure documentation which isn't pure ASCII is now UTF-8 encoded. Reviewed-by: Trust Me
\| \| * \|	qdoc: Removed debugging code.	David Boddie	2010-02-08	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \|	Doc: Updated the configuration file for the Simplified Chinese docs.	David Boddie	2010-02-08	1	-11/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \|	qdoc: Standardized encoding names and updated the Chinese config files.	David Boddie	2010-02-05	4	-2/+152
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \|	Doc: Added Simplified Chinese documents and build rules for them.	David Boddie	2010-02-04	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'master' into qdoc-i18n	David Boddie	2010-02-03	6	-8/+68
\| \| \|\ \
\| \| * \| \|	qdoc: Added support for different source and output character encodings.	David Boddie	2010-02-02	10	-84/+125
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Previously, qdoc assumed Latin1 (ISO-8859-1) for source code and other documentation, and wrote out XHTML with the same encoding. This change adds additional configuration options (sourceencoding, outputencoding, naturallanguage) that enable translated documentation in non-Latin1 encodings to be built with qdoc. To be reviewed before merge into the master branch. Reviewed-by: Trust Me
\| \| * \| \|	Doc: Synchronize configuration files for easier maintenance.	David Boddie	2010-02-02	2	-4/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| * \| \| \|	qdoc3: Added curly braces in switch statement for braindead compiler.	Martin Smith	2010-02-11	4	-11/+26
\| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also added the \pagekeywords command. Task: QTBUG-7877
\| * \| \|	qdoc3: Fixed bug in creation of qt.pageindex.	Martin Smith	2010-02-10	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task: QTBUG-7877
\| * \| \|	qdoc3: Added capability to create qt.pageindex.	Martin Smith	2010-02-10	15	-23/+202
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task: QTBUG-7877
* \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵	Qt Continuous Integration System	2010-02-05	4	-6/+88
\|\ \ \ \ \| \|/ / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3309 commits) Add some painting benchmarks. Make sure cookies are saved. Fix headers::licenseCheck autotest failure Re-add accidentally deleted file Test SizeItemToLoader to SizeLoaderToItem resizeMode change. Document QmlContext ownership. Add bug note. Fix elision and multilength strings when resizing a Text element. Document calling C++ methods from QML. Document margins property Augment documentation doc: There is no easeNone, it is called easeLinear doc: Converted the basic types page to use \qmlbasictype Focus focusScope from focusing for focusOnPress Really run image reader in its own thread. Don't create one QNetworkAccessManager per XMLHttpRequest We use JavaScript, not ECMAScript. XMLHttpRequest redirection update Image.paintedWidth and Image.paintedHeight when the source changes Remove debug. ...
\| * \| \|	Merge branch 'kinetic-declarativeui' of ↵	Warwick Allison	2010-02-04	4	-6/+88
\| \|\ \ \ \| \| \|/ / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
\| \| * \|	Merge branch '4.6' of ../qt into kinetic-declarativeui	Aaron Kennedy	2010-01-20	6	-10/+10
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/kernel/qobject.cpp
\| \| \| * \|	Bump version to 4.6.2.	Jason McDonald	2010-01-19	6	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
\| \| * \| \|	Merge branch '4.6' of ../qt into kinetic-declarativeui	Aaron Kennedy	2010-01-19	1	-1/+1
\| \| \|\ \ \ \| \| \| \|/ /
\| \| * \| \|	Doc fixes.	Michael Brasser	2010-01-15	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-7322
\| \| * \| \|	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2010-01-14	93	-93/+93
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
\| \| * \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Aaron Kennedy	2010-01-05	1	-3/+3
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-17	3	-4/+47
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore tests/benchmarks/benchmarks.pro
\| \| * \ \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-07	2	-5/+2
\| \| \|\ \ \ \ \ \
\| \| * \ \ \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-07	14	-36/+178
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/tools/moc/generator.cpp
\| \| * \ \ \ \ \ \ \	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2009-11-27	1	-16/+0
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui
\| \| * \ \ \ \ \ \ \ \	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2009-11-19	2	-7/+7
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: src/3rdparty/webkit/WebKit/qt/WebCoreSupport/FrameLoaderClientQt.cpp
\| \| * \ \ \ \ \ \ \ \ \	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2009-11-12	1	-30/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui
\| \| \| * \| \| \| \| \| \| \| \| \|	qdoc3: Allow the full signature for QML signals and methods	Martin Smith	2009-11-11	4	-25/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...in the \qmlmethod and \qmlsignal commands, and the corresponding "attached" ones. Previously, the type was not allowed, but it really should be there, which means the \qmlmethod and \qmlsignal commands should be updated throughout.
\| \| \| * \| \| \| \| \| \| \| \| \|	qdoc3: Output the full signature for QML signals and methods	Martin Smith	2009-11-11	2	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the Method Documentation and Signal Documentation sections.
\| \| \| * \| \| \| \| \| \| \| \| \|	qdoc3: Fixed a linking problem for qml methods.	Martin Smith	2009-11-11	7	-88/+152
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
\| \| * \| \| \| \| \| \| \| \| \| \|	Don't display "QML" for attached signals/methods.	Michael Brasser	2009-11-11	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	qdoc3: Allow the full signature for QML signals and methods	Martin Smith	2009-11-10	4	-25/+41
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	...in the \qmlmethod and \qmlsignal commands, and the corresponding "attached" ones. Previously, the type was not allowed, but it really should be there, which means the \qmlmethod and \qmlsignal commands should be updated throughout.
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2009-11-09	2	-2/+32
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: configure.exe src/corelib/animation/qabstractanimation.cpp src/gui/graphicsview/qgraphicsview.cpp src/s60installs/s60installs.pro tools/configure/configureapp.cpp tools/qdoc3/node.h
\| \| * \| \| \| \| \| \| \| \| \| \|	qdoc3: Output the full signature for QML signals and methods	Martin Smith	2009-11-06	2	-2/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In the Method Documentation and Signal Documentation sections.
\| \| * \| \| \| \| \| \| \| \| \| \|	qdoc3: Fixed a linking problem for qml methods.	Martin Smith	2009-11-05	7	-88/+152
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Note the Invalid Syntax errors for some uses of \qmlmethod and \qmlsignal. A syntactically correct signature is now required as the argument.
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2009-11-04	1	-1/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: configure.exe src/gui/graphicsview/qgraphicsitem_p.h
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Accidental commit.	Warwick Allison	2009-11-02	2	-1271/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of ↵	Aaron Kennedy	2009-10-30	5	-22/+47
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/debugger/qmldebug.cpp src/declarative/fx/qmlgraphicsimagebase_p.h src/declarative/util/qmlanimation.h src/declarative/util/qmlstate.h src/declarative/util/qmltimer.cpp