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
*	Clean up QmlImageReader thread on engine destruction.	Martin Jones	2010-02-05	1	-1/+1
\|
*	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵	Qt Continuous Integration System	2010-02-05	51	-7/+7929
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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. ...
\| *	Make sure cookies are saved.	Martin Jones	2010-02-04	1	-1/+4
\| \|
\| *	Merge branch 'kinetic-declarativeui' of ↵	Warwick Allison	2010-02-04	51	-7/+7926
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git://git-nokia.trolltech.com.au/qtsoftware/qt/kinetic Conflicts: src/xmlpatterns/type/qprimitives_p.h tools/linguist/lupdate/main.cpp
\| \| *	Really run image reader in its own thread.	Martin Jones	2010-02-03	1	-4/+2
\| \| \|
\| \| *	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Bea Lam	2010-02-03	57	-402/+359
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| *	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2010-02-02	57	-402/+359
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: tools/linguist/lupdate/main.cpp
\| \| * \| \|	Disallow ids that start with uppercase letters and update docs and	Bea Lam	2010-02-03	1	-5/+5
\| \| \|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	examples accordingly. Task-number: QT-2786
\| \| * \|	Move image network access into a separate thread, with decoding.	Martin Jones	2010-01-29	2	-59/+109
\| \| \| \|
\| \| * \|	Merge commit 'qt/4.6' into kinetic-declarativeui	Bjørn Erik Nilsen	2010-01-27	18	-117/+424
\| \| \|\ \
\| \| * \| \|	Compile with Qt 4.6.1	Aaron Kennedy	2010-01-20	1	-0/+10
\| \| \| \| \|
\| \| * \| \|	Merge branch '4.6' of ../qt into kinetic-declarativeui	Aaron Kennedy	2010-01-20	8	-12/+13
\| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/kernel/qobject.cpp
\| \| * \ \ \	Merge branch '4.6' of ../qt into kinetic-declarativeui	Aaron Kennedy	2010-01-19	2	-2/+3
\| \| \|\ \ \ \
\| \| * \ \ \ \	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Alan Alpert	2010-01-19	1	-0/+3
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| * \| \| \| \|	Doc.	Martin Jones	2010-01-19	1	-0/+1
\| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \|	Allow the QML based file browser to be used in place of native.	Martin Jones	2010-01-19	1	-0/+2
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Fix bad behaviour on N900	Alan Alpert	2010-01-19	1	-1/+1
\| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-7431 Reviewed-by: akennedy
\| \| * \| \| \| \|	Doc fixes.	Michael Brasser	2010-01-15	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-7322
\| \| * \| \| \| \|	Remove debugging	Aaron Kennedy	2010-01-14	1	-1/+0
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Add toggle orientation option	Aaron Kennedy	2010-01-14	2	-0/+14
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Aaron Kennedy	2010-01-14	1212	-1347/+1533
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| * \ \ \ \	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into ↵	Warwick Allison	2010-01-14	1212	-1347/+1533
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	kinetic-declarativeui Conflicts: bin/syncqt src/corelib/io/qurl.cpp
\| \| * \| \| \| \| \| \|	Only force graphicssystem raster on X11	Aaron Kennedy	2010-01-14	1	-1/+1
\| \| \|/ / / / / /
\| \| * \| \| \| \| \|	Various QML browser improvements	Martin Jones	2010-01-12	1	-10/+20
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	- Easier to press Up button - Fix highlight color - Fix keypad navigation
\| \| * \| \| \| \| \|	Always exit on play script failure	Aaron Kennedy	2010-01-12	1	-1/+1
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Move choice of pipelining to the point request.	Warwick Allison	2010-01-11	1	-13/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	(based on advice from Thiago)
\| \| * \| \| \| \| \|	PreferNetwork (the default) is fixed, no need to force PreferCache.	Warwick Allison	2010-01-08	1	-1/+0
\| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of ↵	Warwick Allison	2010-01-05	29	-755/+4397
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| \| \| * \ \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Aaron Kennedy	2010-01-05	29	-755/+4397
\| \| \| \|\ \ \ \ \ \
\| \| * \| \| \| \| \| \| \|	WGZ is just a ZIP, so accept that too.	Warwick Allison	2010-01-05	1	-1/+2
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Basic WGT/WGZ support.	Warwick Allison	2010-01-05	3	-6/+109
\| \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-524
\| \| * \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Michael Brasser	2009-12-18	15	-1635/+0
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| * \| \| \| \| \| \|	Remove creatorplugin (it's moved to the creator repository)	Bea Lam	2009-12-17	15	-1635/+0
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-17	12	-164/+219
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: .gitignore tests/benchmarks/benchmarks.pro
\| \| * \| \| \| \| \| \| \|	Make QListModelInterface API more sensible for our use case.	Martin Jones	2009-12-16	2	-0/+15
\| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-10	1	-1/+1
\| \| \|\ \ \ \ \ \ \ \
\| \| * \| \| \| \| \| \| \| \|	Compile when in a module.	Warwick Allison	2009-12-08	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Add info about qmldebugger and its creator plugin, with screenshot.	Bea Lam	2009-12-08	2	-6/+12
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-07	3	-5/+4
\| \| \|\ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'kinetic-declarativeui' of ↵	Michael Brasser	2009-12-07	26	-59/+343
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui Conflicts: src/declarative/qml/qmlengine.cpp
\| \| \| * \ \ \ \ \ \ \ \ \	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Martin Jones	2009-12-07	20	-42/+191
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| \| * \ \ \ \ \ \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui	Michael Brasser	2009-12-07	20	-42/+191
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/tools/moc/generator.cpp
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Move loader functionality into qmlviewer.	Martin Jones	2009-12-07	5	-31/+115
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of scm.dev.nokia.troll.no:qt/kinetic ↵	Martin Jones	2009-12-07	11	-8/+782
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into kinetic-declarativeui
\| \| \| * \| \| \| \| \| \| \| \| \| \| \|	Bring up network on Symbian.	Martin Jones	2009-12-07	2	-0/+51
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Fix leaks.	Michael Brasser	2009-12-07	1	-3/+1
\| \| \| \|/ / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Add QML based file browser to qmlviewer.	Martin Jones	2009-12-06	11	-8/+782
\| \| \|/ / / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \| \|	Compile as module.	Warwick Allison	2009-12-02	2	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'kinetic-declarativeui' of ↵	Warwick Allison	2009-12-01	5	-3/+316
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	git@scm.dev.nokia.troll.no:qt/kinetic into kinetic-declarativeui
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Build correct QmlViewer Screen orientation implementation for Maemo.	Martin Jones	2009-12-01	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|