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
*	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵	Qt Continuous Integration System	2010-02-09	324	-1/+12534
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (3355 commits) Get test compiling Remove unimplemented methods from header Properly insert objects into the context's object list Missed a file Compile Replace QList<>* support with QmlListProperty Remove old implicit module support. Use networkAccessManagerFactory() for worker threads too. Connect to localhost instead of QHostAddress::Any. Fixes test on Windows. Support the other validators Add empty constructor for validators. Add getter functions to QAbstractDynamicMetaObject and QmlOpenMetaObjectType Document QtObject Changed define name to reflect change in Creator. re-enable QT_USE_FAST_CONCATENATION XMLHttpRequest collection bug For local fonts, we can just addApplicationFont() rather than loading data. The virtual keyboard is now working for TextEdit and TextInput components. Fix viewport size update. Make transformOrigin Center by default ...
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵	Qt Continuous Integration System	2010-02-05	324	-1/+12534
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	324	-1/+12534
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 scm.dev.nokia.troll.no:qt/kinetic ↵	Bea Lam	2010-02-03	11	-14/+17
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| \| *	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2010-02-02	11	-14/+17
\| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
\| \| \| * \| \|	Disallow ids that start with uppercase letters and update docs and	Bea Lam	2010-02-03	12	-37/+37
\| \| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	examples accordingly. Task-number: QT-2786
\| \| \| * \|	Fix QList<QObject*> as a model. Add docs and example.	Martin Jones	2010-02-01	6	-0/+252
\| \| \| \| \|
\| \| \| * \|	Update advanced tutorial with new images	Alan Alpert	2010-02-01	8	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.
\| \| \| * \|	Don't use statics for type definition, at least for plugin modules.	Warwick Allison	2010-02-01	1	-1/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-2798
\| \| \| * \|	Replace FreeMono by OCRA font	Kai Koehne	2010-01-22	3	-1/+1
\| \| \| \| \|
\| \| \| * \|	Remove samegame README (mentioned images have been replaced)	Kai Koehne	2010-01-22	1	-10/+0
\| \| \| \| \|
\| \| \| * \|	Copy updated images from demos/samegame to samegame tutorial	Kai Koehne	2010-01-22	5	-0/+0
\| \| \| \| \|
\| \| \| * \|	Fix examples/declarative/plugins example	Alan Alpert	2010-01-19	1	-1/+2
\| \| \| \| \|
\| \| \| * \|	Merge branch '4.6' of ../qt into kinetic-declarativeui	Aaron Kennedy	2010-01-19	5	-172/+174
\| \| \| \|\ \
\| \| \| * \ \	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2010-01-14	1125	-1244/+1275
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	9	-31/+135
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Load qmlmodules plugins.	Warwick Allison	2010-01-07	4	-0/+136
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This allows projects which use the declarative module to add QML types through C++ modules, such that qmlviewer (or any QML) can import those types.
\| \| \| * \| \| \|	Remove loader. Its functionality is now available in qmlviewer.	Martin Jones	2009-12-22	12	-1086/+0
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-17	9	-76/+113
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore tests/benchmarks/benchmarks.pro
\| \| \| * \| \| \| \|	Allow a ListView.section.delegate to avoid creating sections in delegate.	Martin Jones	2009-12-16	1	-15/+10
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Faster sections.	Martin Jones	2009-12-16	1	-1/+2
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	spring follows do not like to operate on "var" sources	mae	2009-12-14	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-10	1	-2/+2
\| \| \| \|\ \ \ \ \
\| \| \| * \| \| \| \| \|	Update FlowPositioner to the new BasePositioner implementation	Alan Alpert	2009-12-09	1	-5/+0
\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of ↵	Alan Alpert	2009-12-09	1	-9/+53
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| \| \| \| * \| \| \| \| \|	Add a Flow positioner.	Martin Jones	2009-12-08	1	-9/+53
\| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \|	Update positioners example	Alan Alpert	2009-12-09	1	-18/+2
\| \| \| \|/ / / / / /
\| \| \| * \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-07	1	-1/+1
\| \| \| \|\ \ \ \ \ \
\| \| \| * \ \ \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-07	7	-22/+25
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/tools/moc/generator.cpp
\| \| \| * \ \ \ \ \ \ \	Merge branch 'kinetic-declarativeui' of ↵	Martin Jones	2009-12-02	3	-87/+2
\| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| \| \| \| * \ \ \ \ \ \ \	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Martin Jones	2009-12-02	2	-3/+19
\| \| \| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| \| * \| \| \| \| \| \| \| \|	Remove qlistmodelinterface.h duplicate	Martin Jones	2009-12-02	3	-87/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of ↵	Martin Jones	2009-12-02	2	-3/+19
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| \| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Aaron Kennedy	2009-12-01	1	-60/+0
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of /Users/akennedy/Qt/kinetic2 into ↵	Aaron Kennedy	2009-11-30	4	-13/+17
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui
\| \| \| \| \| * \ \ \ \ \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Aaron Kennedy	2009-11-30	4	-13/+17
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/animation/qabstractanimation.cpp
\| \| \| \| * \| \| \| \| \| \| \| \| \| \|	Two way WorkerScript communications	Aaron Kennedy	2009-11-30	2	-3/+19
\| \| \| \| \|/ / / / / / / / / /
\| \| \| * \| \| \| \| \| \| \| \| \| \|	When loading QML, reset the Browser view.	Martin Jones	2009-12-02	1	-4/+17
\| \| \| \| \|_\|/ / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Remove accidentally added file.	Michael Brasser	2009-12-01	1	-60/+0
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2009-11-30	4	-13/+17
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / \| \| \| \|/\| / / / / / / / / \| \| \| \| \|/ / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: src/corelib/animation/qabstractanimation.cpp
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Aaron Kennedy	2009-11-30	1	-7/+1
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| \| * \ \ \ \ \ \ \ \	Merge branch 'kinetic-declarativeui' of ↵	Martin Jones	2009-11-30	3	-2/+3
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Add ListView snapMode to ensure flicking settles on an item boundary.	Martin Jones	2009-11-30	1	-7/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Basic WorkerScript functionality	Aaron Kennedy	2009-11-30	2	-0/+46
\| \| \| \| \|/ / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of ↵	Warwick Allison	2009-11-29	3	-2/+3
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Fix tutorial3.	Michael Brasser	2009-11-29	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-6306
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Fix use of XmlHttpRequest in examples	Alan Alpert	2009-11-27	1	-0/+1
\| \| \| \| \|/ / / / / / / / /
\| \| \| \| * \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Martin Jones	2009-11-27	91	-847/+277
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| \| * \ \ \ \ \ \ \ \ \	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Martin Jones	2009-11-27	3	-3/+88
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui Conflicts: examples/declarative/loader/qmlfolderlistmodel.h
\| \| \| \| * \| \| \| \| \| \| \| \| \| \|	Symbian fixes.	Martin Jones	2009-11-27	2	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|