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-s60-public	axis	2010-03-01	107	-358/+3573
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-02-26	4	-74/+89
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits) Added addMMPRules for adding conditional MMP_RULES Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f. Fix for cetest. Speed up compilation of this test with MSVC. New benchmark for QDirIterator Backporting auto-test utility header from master. Fix a signed/unsigned comparison compiler warning Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Cleaning of the patch to QTBUG-3168 Patch to QTBUG-3168 Crash in QGraphicsScenePrivate::setFocusItemHelper Pass the right arguments to QApplication in GraphicsView benchmark. Improvements to itemview keypad navigation in S60. Revert changes made in scroll_sys(). Fix SymbianMakefileGenerator::absolutizePath for clean builds Set the roleNames of proxy models to the roleNames of the source model. Add benchmarks for accessing meta-object properties via QScriptValue ...
\| \| *	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60	axis	2010-02-26	4	-74/+89
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
\| \| \| *	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-02-22	4	-74/+89
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QFontDialog::exec() never returns on OSX QNetworkRequest: Doc enhancement Port http example to QNetworkAccessManager loopback network example: Make use of bytesToWrite()
\| \| \| \| *	Port http example to QNetworkAccessManager	Markus Goetz	2010-02-22	3	-71/+82
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QHttp. Must. Die. Reviewed-by: Peter Hartmann
\| \| \| \| *	loopback network example: Make use of bytesToWrite()	Markus Goetz	2010-02-21	1	-3/+7
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: TrustMe
\| * \| \| \|	Change Connection syntax as per QT-2822.	Warwick Allison	2010-02-26	1	-2/+2
\| \| \| \| \|
\| * \| \| \|	Renamed Flickable viewportXXX properties contentXXX	Martin Jones	2010-02-26	7	-12/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	A viewport is the thing you look through, not what you look at.
\| * \| \| \|	Introduced QDeclarativeExtensionPlugin::registerTypes(uri).	Roberto Raggi	2010-02-25	1	-3/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now, you have to reimplement registerTypes(uri) to expose native QML types, and initializeEngine(engine,uri) to add instances to the QML engine's root context.
\| * \| \| \|	Add simple Package example.	Martin Jones	2010-02-25	2	-0/+79
\| \| \| \| \|
\| * \| \| \|	Connections example could be turned incorrectly	Yann Bodson	2010-02-25	1	-8/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-8345
\| * \| \| \|	Add subdirs .pro for examples/declarative/extending	Aaron Kennedy	2010-02-24	2	-0/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Also fix up a compile error.
\| * \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Warwick Allison	2010-02-24	1	-0/+1
\| \|\ \ \ \
\| \| * \| \| \|	Add an "asynchonous" property to Image.	Martin Jones	2010-02-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Allows loading/decoding local images in an asynchronous thread (already the case for network images).
\| * \| \| \| \|	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt	Warwick Allison	2010-02-24	20	-1/+3092
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| / / / \| \| \|/ / / \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
\| \| * \| \|	Merge remote branch 'origin/master' into bearermanagement/staging	Aaron McCarthy	2010-02-23	71	-114/+218
\| \| \|\ \ \
\| \| * \ \ \	Merge remote branch 'origin/master' into bearermanagement/unit-tests	Aaron McCarthy	2010-02-22	86	-465/+706
\| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/network/access/qnetworkaccessmanager.cpp
\| \| * \ \ \ \	Merge remote branch 'origin/master' into bearermanagement/unit-tests	Aaron McCarthy	2010-02-17	3	-98/+98
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge remote branch 'origin/master' into bearermanagement/integration	Aaron McCarthy	2010-02-14	324	-1/+12534
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/qlineedit/tst_qlineedit.cpp
\| \| * \ \ \ \ \ \	Merge remote branch 'origin/master' into bearermanagement/integration	Aaron McCarthy	2010-02-11	55	-1362/+524
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure
\| \| * \ \ \ \ \ \ \	Merge remote branch 'origin/4.6' into bearermanagement/integration	Aaron McCarthy	2010-02-11	17	-20/+29
\| \| \|\ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/s60installs/s60installs.pro
\| \| * \| \| \| \| \| \| \| \|	Display session statistics.	Aaron McCarthy	2010-02-08	3	-4/+69
\| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \|	Merge commit 'origin/4.6' into bearermanagement/integration-4	Aaron McCarthy	2010-01-29	1133	-1487/+1560
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-211/+219
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	-211/+219
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'bearermanagement/corewlan' into bearermanagement/integration-2	Aaron McCarthy	2010-01-05	13	-32/+25
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| \| * \| \| \| \| \| \| \| \| \|	Fix up license headers.	Aaron McCarthy	2009-12-22	10	-10/+10
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \| \|	Make compile.	Aaron McCarthy	2009-12-22	7	-40/+14
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Bearer Management Integration 2.	Aaron McCarthy	2010-01-04	5	-28/+26
\| \| \|/ / / / / / / / / /
\| \| * \| \| \| \| \| \| \| \| \|	Bearer Management Integration 1.	Aaron McCarthy	2009-12-22	19	-0/+3027
\| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \|	Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵	Warwick Allison	2010-02-24	46	-129/+129
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QDeclarativeXXX.
\| * \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Warwick Allison	2010-02-23	24	-94/+103
\| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp
\| \| * \| \| \| \| \| \| \| \| \| \|	Get rid of the useless import 'files'	Roberto Raggi	2010-02-23	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: mae
\| \| * \| \| \| \| \| \| \| \| \| \|	Fixed the install rules for the QML plugins example.	Roberto Raggi	2010-02-23	1	-11/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Install the QML components in $[QT_INSTALL_EXAMPLES]/declarative/plugins/com/nokia/TimeExample and the source files in $[QT_INSTALL_EXAMPLES]/declarative/plugins/
\| \| * \| \| \| \| \| \| \| \| \| \|	Added the qmldir file for declarative plugins example	Thorbjørn Lindeijer	2010-02-23	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Get rid of QmlModulePlugin.	Roberto Raggi	2010-02-23	7	-11/+16
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Updates all qml examples/demos to use the easing curve value type syntax	Leonardo Sobral Cunha	2010-02-23	13	-75/+77
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \| \|	Remove QmlView::execute(). QmlView::setSource() does it all now.	Martin Jones	2010-02-23	2	-4/+2
\| \| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-2538
\| * \| \| \| \| \| \| \| \| \| \|	Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.	Warwick Allison	2010-02-23	30	-47/+58
\| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-2798
* \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-02-23	87	-494/+839
\|\ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
\| * \| \| \| \| \| \| \| \| \|	Updated based on change to transformOrign	Nigel Hietala	2010-02-22	5	-0/+5
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵	Qt Continuous Integration System	2010-02-22	66	-114/+213
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: Replace QmlList* and QList* support with a single QmlListProperty type Rename MouseRegion -> MouseArea Update QmlChanges with animation API changes. Document the default velocity of EaseFollow Remove use of unexprted private classes. Fix compile error on Solaris Increase durations when testing Behaviors. Add cached path rounded rect painting benchmark. Remove use of direct event posting. Use QTest::keyClick() for keys.
\| \| * \| \| \| \| \| \| \| \|	Replace QmlList* and QList* support with a single QmlListProperty type	Aaron Kennedy	2010-02-22	25	-57/+156
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	As a value type QmlListProperty doesn't consume any memory in the object. It also has a companion QmlListReference class that is part of the public API for C++ developers to interact with that also manages memory issues that existed with previous solutions (if the containing QObject was destroyed it left a dangling pointer).
\| \| * \| \| \| \| \| \| \| \|	Rename MouseRegion -> MouseArea	Martin Jones	2010-02-22	41	-57/+57
\| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \|	Merge remote branch 'origin/master' into qt-master-from-4.6	Thiago Macieira	2010-02-20	27	-41/+177
\| \|\ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
\| \| * \| \| \| \| \| \| \| \|	Fix dynamic example	Alan Alpert	2010-02-19	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Dynamic property creation appears to have been restricted.
\| \| * \| \| \| \| \| \| \| \|	More strict type checking of ListElement properties.	Warwick Allison	2010-02-19	2	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-6203
\| \| * \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt	Martin Jones	2010-02-18	57	-86/+86
\| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/linux-g++-x11egl/qplatformdefs.h src/declarative/qml/qmldom.h src/declarative/util/qmlview.cpp src/declarative/util/qmlview.h tools/qdoc3/cppcodemarker.cpp tools/qmldebugger/standalone/canvasframerate.cpp tools/qmldebugger/standalone/engine.cpp tools/qmldebugger/standalone/expressionquerywidget.cpp tools/qmldebugger/standalone/expressionquerywidget.h tools/qmldebugger/standalone/objectpropertiesview.cpp tools/qmldebugger/standalone/objectpropertiesview.h tools/qmldebugger/standalone/objecttree.cpp tools/qmldebugger/standalone/qmldebugger.cpp tools/qmldebugger/standalone/watchtable.cpp tools/qmldebugger/standalone/watchtable.h
\| \| * \ \ \ \ \ \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Martin Jones	2010-02-18	20	-37/+37
\| \| \|\ \ \ \ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \| \| \| \|	Get rid of the matchProperties/properties distinction, as it	Michael Brasser	2010-02-18	20	-37/+37
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	has proven to be confusing in practice. property/target and properties/targets will be functionally equivilant (the only distinction being singular/plural). In a transition these properties can be used for both 'matching' and explicit animation based on whether a 'to' value is supplied. The documentation, tests, examples and demos have been updated as well.