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
*	Document QtObject	Alan Alpert	2010-02-08	2	-1/+2
\| \| \| \|	Task-number:QTBUG-6034
*	Better documentation of "model" and "modelData" in delegates.	Martin Jones	2010-02-08	1	-5/+63
\| \| \| \|	Task-number: QTBUG-6396
*	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵	Qt Continuous Integration System	2010-02-05	179	-2/+8641
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3324 commits) Fix test. Remove hacky fix (breaks autotest). Fix Behaviors for object-type properties. Pass symbols::prefix (Action -> QmlAction) Add license header. Fix bad merge (compile) Pass tst_headers::licenseCheck Fix ListView tests. Test fixes. More test fixes. Clean up QmlImageReader thread on engine destruction. Update test to handle QmlNetworkAccessManagerFactory Test fixes. Add a QEXPECT_FAIL for known bug. Fix autotest. 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. ...
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵	Qt Continuous Integration System	2010-02-05	179	-2/+8641
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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. ...
\| \| *	Document QmlContext ownership.	Martin Jones	2010-02-04	1	-1/+4
\| \| \|
\| \| *	Merge branch 'kinetic-declarativeui' of ↵	Warwick Allison	2010-02-04	179	-2/+8638
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
\| \| \| *	Merge branch 'kinetic-declarativeui' of ↵	Martin Jones	2010-02-04	3	-173/+289
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| \| \| \| *	Augment documentation	Alan Alpert	2010-02-03	2	-0/+32
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Document automatic signal handlers and QmlViewer.Screen.
\| \| \| \| *	doc: Converted the basic types page to use \qmlbasictype	Martin Smith	2010-02-03	1	-173/+257
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The changes to qdoc3 to support this will be in the 4.7 master branch.
\| \| \| * \|	Document calling C++ methods from QML.	Martin Jones	2010-02-04	1	-0/+95
\| \| \| \|/
\| \| \| *	We use JavaScript, not ECMAScript.	Martin Jones	2010-02-03	12	-38/+38
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-7720
\| \| \| *	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Bea Lam	2010-02-03	6	-8/+28
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| \| *	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2010-02-02	6	-8/+28
\| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
\| \| \| * \| \|	Disallow ids that start with uppercase letters and update docs and	Bea Lam	2010-02-03	4	-14/+21
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	examples accordingly. Task-number: QT-2786
\| \| \| * \|	Fix QList<QObject*> as a model. Add docs and example.	Martin Jones	2010-02-01	1	-5/+52
\| \| \| \| \|
\| \| \| * \|	Update advanced tutorial with new images	Alan Alpert	2010-02-01	4	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some of the images used in the example and documentation were still with the old graphics. This has been fixed so as to only use the new graphics.
\| \| \| * \|	Document possibility of -1 index in delegate.	Martin Jones	2010-01-29	1	-0/+7
\| \| \| \| \|
\| \| \| * \|	Merge commit 'qt/4.6' into kinetic-declarativeui	Bjørn Erik Nilsen	2010-01-27	4	-6/+6
\| \| \| \|\ \
\| \| \| * \ \	Merge branch '4.6' of ../qt into kinetic-declarativeui	Aaron Kennedy	2010-01-20	2	-2/+2
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/kernel/qobject.cpp
\| \| \| * \ \ \	Merge branch '4.6' of ../qt into kinetic-declarativeui	Aaron Kennedy	2010-01-19	17	-140/+883
\| \| \| \|\ \ \ \
\| \| \| * \| \| \| \|	Doc fixes.	Michael Brasser	2010-01-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-7322
\| \| \| * \| \| \| \|	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2010-01-14	1244	-1348/+1471
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
\| \| \| * \| \| \| \| \|	Allow QML types defined in both C++ and QML files to be in the same module.	Warwick Allison	2010-01-08	1	-1/+4
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	doc	Warwick Allison	2010-01-08	2	-18/+59
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-7125
\| \| \| * \| \| \| \| \|	Improve documentation	Alan Alpert	2010-01-05	6	-18/+220
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Extend documentation on dynamically created objects and on integrating with existing applications. And make those pages more discoverable.
\| \| \| * \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Aaron Kennedy	2010-01-05	1	-1/+1
\| \| \| \|\ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Add documentation for integrating with existing Qt UI code	Alan Alpert	2009-12-30	2	-1/+92
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Doc fix	Alan Alpert	2009-12-18	1	-2/+2
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-17	6	-57/+117
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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-10	2	-10/+10
\| \| \| \|\ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \|	Add simple translation example to docs.	Michael Brasser	2009-12-09	1	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of ↵	Warwick Allison	2009-12-09	2	-8/+9
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| \| \| \| * \| \| \| \| \| \| \| \|	Link to QML Debugging from index page	Bea Lam	2009-12-09	2	-8/+9
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Increase prominence of "QML", since many people know the technology by that ↵	Warwick Allison	2009-12-09	2	-2/+2
\| \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	name.
\| \| \| * \| \| \| \| \| \| \| \|	Add info about qmldebugger and its creator plugin, with screenshot.	Bea Lam	2009-12-08	2	-2/+51
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Add barebones debugging documentation.	Michael Brasser	2009-12-08	2	-1/+72
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Add barebones i18n documentation.	Michael Brasser	2009-12-08	3	-0/+68
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-07	1	-4/+1
\| \| \| \|\ \ \ \ \ \ \ \ \
\| \| \| * \ \ \ \ \ \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-07	7	-24/+37
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/tools/moc/generator.cpp
\| \| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Bea Lam	2009-12-01	1	-12/+12
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| \| * \ \ \ \ \ \ \ \ \ \	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2009-11-30	1	-12/+12
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	doc fix	Bea Lam	2009-11-30	1	-1/+1
\| \| \| \|/ / / / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Doc	Aaron Kennedy	2009-11-30	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Doc	Aaron Kennedy	2009-11-27	1	-9/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2009-11-27	65	-263/+2207
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Doc fix	Alan Alpert	2009-11-26	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	From Thomas Zander
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Bea Lam	2009-11-26	1	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| \| * \ \ \ \ \ \ \ \ \ \ \ \	Merge branch 'kinetic-declarativeui' of ↵	Martin Jones	2009-11-26	6	-20/+48
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| \| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Crop whitespace from image.	Martin Jones	2009-11-26	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-2384
\| \| \| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Doc fixes	Bea Lam	2009-11-26	1	-0/+4
\| \| \| \| \|/ / / / / / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|