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
*	Don't crash if the currentIndex is set while creating a delegate.	Martin Jones	2010-02-24	2	-0/+48
\| \| \| \|	Task-number: QTBUG-8456
*	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Warwick Allison	2010-02-24	5	-6/+41
\|\
\| *	Add an "asynchonous" property to Image.	Martin Jones	2010-02-24	2	-6/+12
\| \| \| \| \| \| \| \| \| \|	Allows loading/decoding local images in an asynchronous thread (already the case for network images).
\| *	Make compile following renaming of class.	Bea Lam	2010-02-24	1	-1/+1
\| \|
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Bea Lam	2010-02-24	61	-892/+892
\| \|\
\| * \|	Automatically connect to a notify signal if the requested signal is	Bea Lam	2010-02-24	3	-0/+29
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	in the "onFooChanged" form, even if the notify signal is not called "fooChanged". Task-number: QT-2783
* \| \|	Manually merge 0f761d9d95bc187cb786ce7dc03a7d8c9ad9d779	Warwick Allison	2010-02-24	2	-2/+2
\| \| \|
* \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Warwick Allison	2010-02-24	61	-892/+892
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	Change autotest class prefix from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX ↵	Leonardo Sobral Cunha	2010-02-24	60	-891/+891
\| \| \| \| \| \| \| \| \| \| \| \|	to QDeclarativeXXX.
\| * \|	Fix declarative failing auto-test, missing rename of the test file	Leonardo Sobral Cunha	2010-02-24	2	-1/+1
\| \|/
* \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt	Warwick Allison	2010-02-24	28	-0/+4851
\|\ \ \| \|/ \|/\| \| \| \| \| \| \|	Conflicts: tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵	Qt Continuous Integration System	2010-02-23	30	-2/+4853
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (120 commits) Make compile on Maemo6. Fix build on Symbian. Change initialization order. Increase try verify timeout. Add locking to bearer code. Fixed qnetworksession test on Mac. Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. Simplify. ...
\| \| *	Merge remote branch 'staging/master' into bearermanagement/unit-tests	Aaron McCarthy	2010-02-22	1	-0/+1
\| \| \|\
\| \| \| *	Fixed qnetworksession test on Mac.	Rohan McGovern	2010-02-21	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use an app bundle for this helper app.
\| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵	Qt Continuous Integration System	2010-02-20	28	-0/+4850
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (114 commits) Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. Simplify. Optimise iterations over QHash. Use snippets. Reorder members to remove hole. Expand documentation for QNAM::setConfiguration() and friends. Fix build on Windows, typo. Fix build on Windows. ...
\| \| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵	Qt Continuous Integration System	2010-02-20	28	-0/+4850
\| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/mobility-staging: (114 commits) Create unit-test in parent directory. Allow QNAM to be created as a global variable. Don't load NetworkManager plugin in NetworkManager is not available. Disable NLA plugin, build generic on win32 and mac. Fix QNetworkSession unit test. Fix segfault. Remove debug output. Make this a warning. Don't block forever if no bearer plugins are loaded. Always build generic plugin when building NetworkManager plugin. Add QT_MODULE headers. Change docs: "phone" -> "device". Remove unused code. Simplify. Optimise iterations over QHash. Use snippets. Reorder members to remove hole. Expand documentation for QNAM::setConfiguration() and friends. Fix build on Windows, typo. Fix build on Windows. ...
\| \| \| \| \| *	Merge remote branch 'origin/master' into mobility-master	Rohan McGovern	2010-02-19	217	-815/+14020
\| \| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/network/access/qnetworkaccessmanager.cpp
\| \| * \| \| \| \|	Increase try verify timeout.	Aaron McCarthy	2010-02-22	2	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge remote branch 'origin/master' into bearermanagement/unit-tests	Aaron McCarthy	2010-02-22	505	-1327/+33276
\| \| \|\ \ \ \ \ \| \| \| \|/ / / / \| \| \| \| \| / / \| \| \| \|_\|/ / \| \| \|/\| \| \|	Conflicts: src/network/access/qnetworkaccessmanager.cpp
\| \| * \| \| \|	Create unit-test in parent directory.	Aaron McCarthy	2010-02-19	3	-1/+12
\| \| \| \| \| \|
\| \| * \| \| \|	Merge remote branch 'origin/master' into bearermanagement/unit-tests	Aaron McCarthy	2010-02-17	26	-83/+82
\| \| \|\ \ \ \
\| \| * \| \| \| \|	Fix QNetworkSession unit test.	Aaron McCarthy	2010-02-16	3	-10/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Make sure test can find lackey process. Always connect lackey to tests IPC socket.
\| \| * \| \| \| \|	Make this a warning.	Aaron McCarthy	2010-02-16	1	-2/+2
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	Merge remote branch 'origin/master' into bearermanagement/integration	Aaron McCarthy	2010-02-14	1582	-1/+178279
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
\| \| * \ \ \ \ \	Merge remote branch 'origin/master' into master-mobility	Rohan McGovern	2010-02-11	5	-5/+114
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
\| \| * \ \ \ \ \ \	Merge remote branch 'origin/master' into bearermanagement/integration	Aaron McCarthy	2010-02-11	66	-242/+3093
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure
\| \| * \ \ \ \ \ \ \	Merge remote branch 'origin/4.6' into bearermanagement/integration	Aaron McCarthy	2010-02-11	274	-3535/+9734
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/s60installs/s60installs.pro
\| \| * \ \ \ \ \ \ \ \	Merge commit 'BearerIntegration-5' into remove-manual-test	Aaron McCarthy	2010-02-03	4	-20/+53
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qnetworksession/lackey/lackey.pro tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.cpp
\| \| \| * \| \| \| \| \| \| \| \|	Bearer Management Integration 5.	Aaron McCarthy	2010-02-03	4	-20/+52
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge commit 'origin/4.6' into bearermanagement/integration-4	Aaron McCarthy	2010-01-29	1494	-3770/+12158
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure src/gui/painting/qpainter.cpp src/s60installs/s60installs.pro
\| \| * \ \ \ \ \ \ \ \ \ \	Merge commit 'BearerIntegration-4' into bearermanagement/integration-4	Aaron McCarthy	2010-01-29	3	-1/+19
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|/ / / / / / / / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: config.tests/unix/networkmanager/networkmanager.pro src/network/bearer/bearer.pro src/network/bearer/qnetworkconfiguration_s60_p.cpp tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro
\| \| \| * \| \| \| \| \| \| \| \| \|	Bearer Management Integration 4.	Aaron McCarthy	2010-01-29	3	-0/+18
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Port session functionality.	Aaron McCarthy	2010-01-18	1	-3/+13
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2	Aaron McCarthy	2010-01-05	22	-85/+41
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: config.tests/mac/corewlan/corewlan.pro examples/network/bearercloud/bearercloud.pro examples/network/bearermonitor/bearermonitor.pro src/network/bearer/bearer.pro src/network/bearer/qnativewifiengine_win.cpp src/network/bearer/qnetworkconfigmanager_p.cpp src/network/bearer/qnetworkconfiguration_s60_p.cpp src/network/bearer/qnetworksession.cpp src/network/bearer/qnetworksession_p.cpp src/network/bearer/qnmwifiengine_unix.cpp src/network/bearer/qnmwifiengine_unix_p.h src/plugins/bearer/corewlan/qcorewlanengine.mm src/plugins/bearer/generic/qgenericengine.cpp src/plugins/bearer/nla/main.cpp src/plugins/bearer/nla/qnlaengine.cpp tests/auto/qnetworkconfigmanager/qnetworkconfigmanager.pro tests/auto/qnetworkconfiguration/qnetworkconfiguration.pro tests/auto/qnetworksession/lackey/lackey.pro tests/auto/qnetworksession/tst_qnetworksession/tst_qnetworksession.pro tests/manual/bearerex/bearerex.pro tests/manual/networkmanager/networkmanager.pro
\| \| \| * \| \| \| \| \| \| \| \| \|	Update license headers.	Aaron McCarthy	2009-12-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Fix QNetworkSession unit tests.	Aaron McCarthy	2009-12-22	1	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Fix out of process test by trimming input read from lackey. Don't fail in cleanupTestCase() if sessionOpenCloseStop() is not run due to command line.
\| \| \| * \| \| \| \| \| \| \| \| \|	Make unit tests compile.	Aaron McCarthy	2009-12-22	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Fix up license headers.	Aaron McCarthy	2009-12-22	14	-14/+21
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Make compile.	Aaron McCarthy	2009-12-22	14	-81/+14
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Bearer Management Integration 2.	Aaron McCarthy	2010-01-04	14	-81/+93
\| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	Bearer Management Integration 1.	Aaron McCarthy	2009-12-22	27	-0/+4806
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵	Warwick Allison	2010-02-24	1349	-31180/+31183
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QDeclarativeXXX.
* \| \| \| \| \| \| \| \| \| \| \|	Fix positioner auto test with new easing curve syntax	Joona Petrell	2010-02-24	1	-4/+4
\| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Warwick Allison	2010-02-24	9	-6/+59
\|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/declarative/qml/qml.h
\| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Bea Lam	2010-02-24	8	-2/+161
\| \|\ \ \ \ \ \ \ \ \ \ \ \
\| \| * \ \ \ \ \ \ \ \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt	Martin Jones	2010-02-24	5	-2/+55
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Merge remote branch 'origin/master'	Thiago Macieira	2010-02-23	83	-843/+788
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc src/declarative/graphicsitems/qmlgraphicsmousearea.cpp src/multimedia/playback/qmediaplayer.cpp
\| \| \| \| * \ \ \ \ \ \ \ \ \ \	Merge branch 'qt-master-from-4.6' of ↵	Qt Continuous Integration System	2010-02-23	2	-1/+15
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	scm.dev.nokia.troll.no:qt/qt-integration into master-integration * 'qt-master-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: Don't process uic3 subdir if qt3support is disabled. Fixed failure of tst_symbols when Qt is configured with -qtnamespace
\| \| \| \| \| * \ \ \ \ \ \ \ \ \ \	Merge remote branch 'origin/4.6' into integration-master-from-4.6	Rohan McGovern	2010-02-22	2	-1/+15
\| \| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ / / \| \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| * \| \| \| \| \| \| \| \| \|	Don't process uic3 subdir if qt3support is disabled.	Rohan McGovern	2010-02-22	1	-1/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|