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
*	Add QEasingCurve to datastream format docs	Leonardo Sobral Cunha	2010-02-26	1	-4/+15
\|
*	Merge branch 'master' of git:qt/qt-qml	Thiago Macieira	2010-02-25	28	-162/+180
\|\ \| \| \| \| \| \| \| \|	Conflicts: src/declarative/graphicsitems/qdeclarativeparticles.cpp
\| *	Document Package	Martin Jones	2010-02-25	1	-0/+1
\| \|
\| *	Revert "Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView"	Aaron Kennedy	2010-02-25	1	-10/+0
\| \| \| \| \| \| \| \|	This reverts commit 327d212f5cff81f1c21b7be5c54b3e1eab4f0ac5.
\| *	Add QDeclarativeGraphicsWidget, a QGraphicsWidget version of QmlView	Alan Alpert	2010-02-24	1	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Could use to be renamed. Possibly to -QDeclarativeViewGraphicsWidget -QGraphicsDeclarativeViewWidget (Or QGraphicsD20, in the spirit of i18n) But those aren't any shorter. Task-number: QTBUG-7067
\| *	Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qt	Warwick Allison	2010-02-24	2	-0/+58
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: tests/auto/declarative/qmlgraphicsborderimage/tst_qmlgraphicsborderimage.cpp tests/auto/declarative/qmlgraphicsimage/tst_qmlgraphicsimage.cpp
\| * \|	Change class prefix to from QmlXXX to QDeclarativeXXX, QmlGraphicsXXX to ↵	Warwick Allison	2010-02-24	28	-125/+125
\| \| \| \| \| \| \| \| \| \| \| \|	QDeclarativeXXX.
\| * \|	doc	Warwick Allison	2010-02-24	1	-1/+1
\| \| \|
\| * \|	doc	Warwick Allison	2010-02-24	1	-1/+1
\| \| \|
\| * \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Warwick Allison	2010-02-24	23	-915/+522
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/declarative/qml/qml.h
\| \| * \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt	Martin Jones	2010-02-24	23	-915/+522
\| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/declarative/advtutorial1.qdoc src/declarative/qml/qmlmoduleplugin.cpp src/declarative/util/qmlxmllistmodel.cpp
\| * \| \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Warwick Allison	2010-02-23	4	-24/+13
\| \|\ \ \ \ \| \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/declarative/util/qmlanimation.cpp src/declarative/util/qmlxmllistmodel.cpp
\| \| * \| \|	Adds QmlEasingValueType to qml	Leonardo Sobral Cunha	2010-02-23	1	-6/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Now it's possible to use easing curve types directly in qml as value types, {easing.type: "OutBounce"; easing.amplitude: 3}, instead of the former ugly string format, like "easeOutBounce(amplitude:3.0)". Reviewed-by: akennedy
\| \| * \| \|	Make QmlBinding (and friends) private	Aaron Kennedy	2010-02-23	1	-12/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QmlBinding exposes way too many implementation details to be confident about making it public right now.
\| \| * \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Martin Jones	2010-02-23	2	-6/+37
\| \| \|\ \ \
\| \| \| * \| \|	Doc.	Michael Brasser	2010-02-23	1	-6/+6
\| \| \| \| \| \|
\| \| * \| \| \|	Add support for setting the root index when using a QAbstractItemModel.	Martin Jones	2010-02-23	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-2777
\| * \| \| \| \|	Remove QML_DEFINE_... macros, now use QML_REGISTER_... macros calls.	Warwick Allison	2010-02-23	2	-21/+18
\| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QT-2798
\| * \| \| \|	Add documentation on QMLs memory management assumptions	Aaron Kennedy	2010-02-23	1	-0/+31
\| \|/ / /
* \| \| \|	Doc: fix formatting	aavit	2010-02-24	1	-22/+22
\| \|_\|/ \|/\| \|
* \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/mobility-staging into ↵	Qt Continuous Integration System	2010-02-23	2	-0/+58
\|\ \ \ \| \|_\|/ \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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 'origin/master' into bearermanagement/unit-tests	Aaron McCarthy	2010-02-22	66	-1120/+2608
\| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/network/access/qnetworkaccessmanager.cpp
\| * \| \|	Use snippets.	Aaron McCarthy	2010-02-15	1	-0/+49
\| \| \| \|
\| * \| \|	Expand documentation for QNAM::setConfiguration() and friends.	Aaron McCarthy	2010-02-15	1	-0/+9
\| \| \| \|
* \| \| \|	Merge remote branch 'origin/master'	Thiago Macieira	2010-02-23	16	-34/+38
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| * \| \|	Documentation Update	Alan Alpert	2010-02-22	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Mention that the same game tutorial is now slightly different to the demo version.
\| * \| \|	Doc fix	Alan Alpert	2010-02-22	1	-1/+1
\| \| \| \|
\| * \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵	Qt Continuous Integration System	2010-02-22	18	-35/+35
\| \|\ \ \ \| \| \|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	3	-9/+9
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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	15	-26/+26
\| \| \| \|
* \| \| \|	Merge branch 'master' of git:qt/qt	Thiago Macieira	2010-02-21	41	-80/+125
\|\ \ \ \ \| \|/ / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/declarative/advtutorial1.qdoc doc/src/declarative/advtutorial2.qdoc doc/src/declarative/advtutorial3.qdoc doc/src/declarative/advtutorial4.qdoc doc/src/declarative/tutorial1.qdoc doc/src/declarative/tutorial2.qdoc doc/src/declarative/tutorial3.qdoc
\| * \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-02-20	1	-40/+85
\| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Compile fix for symbian license doc updated for libtiff 3.9.2 Our configuration and build modifications to libtiff Add libtiff 3.9.2 Update license doc, .pro file and qjpeghandler for libjpeg 8 Our configuration and build modifications to libjpeg Add libjpeg 8 Delete libjpeg 6b Delete libtiff 3.8.2
\| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-02-20	1	-40/+85
\| \| \|\ \ \ \| \| \| \|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: license doc updated for libtiff 3.9.2 Our configuration and build modifications to libtiff Add libtiff 3.9.2 Update license doc, .pro file and qjpeghandler for libjpeg 8 Our configuration and build modifications to libjpeg Add libjpeg 8 Delete libjpeg 6b Delete libtiff 3.8.2
\| \| \| * \|	Merge branch 'rtiff392'	aavit	2010-02-20	1	-39/+78
\| \| \| \|\ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/legal/3rdparty.qdoc
\| \| \| \| * \|	license doc updated for libtiff 3.9.2	aavit	2010-02-16	1	-39/+78
\| \| \| \| \| \|
\| \| \| * \| \|	Merge branch 'rjpeg8'	aavit	2010-02-20	1	-7/+13
\| \| \| \|\ \ \
\| \| \| \| * \| \|	Update license doc, .pro file and qjpeghandler for libjpeg 8	aavit	2010-02-16	1	-7/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	In libjpeg versions >= 7, the default unit-scaling when decompressing is given as 8/8 instead of 1/1.
\| * \| \| \| \| \|	Doc: these files are NOT part of the test suite of the Qt toolkit	Thiago Macieira	2010-02-20	46	-46/+46
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote branch 'origin/master' into qt-master-from-4.6	Thiago Macieira	2010-02-20	10	-53/+145
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp src/opengl/qgl.cpp
\| * \| \| \| \| \|	Merge remote branch 'origin/master' into qt-master-from-4.6	Thiago Macieira	2010-02-18	56	-1059/+2410
\| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/codecs/qtextcodec.h tests/auto/gestures/tst_gestures.cpp
\| * \ \ \ \ \ \	Merge branch '4.6' into qt-master-from-4.6	Thiago Macieira	2010-02-17	1	-1/+1
\| \|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/common/symbian/symbian.conf src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp tools/assistant/tools/assistant/helpviewer.cpp
\| \| * \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-02-12	1	-1/+1
\| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Compile fix on Mac with 10.5 sdk. QTestLib: don't crash if data tag requested, none available Implement the blend functions with SSE2 doc: Added some since version information. Ignore touch and gesture events when excluding input events Implemented GraphicsView Panel support for gestures. doc: Fixed several typos. Add MSVC-specific expected failures for JS test suite
\| \| \| * \| \| \| \| \|	doc: Fixed several typos.	Martin Smith	2010-02-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task: QTBUG-7997
* \| \| \| \| \| \| \| \|	Merge remote branch 'origin/master'	Thiago Macieira	2010-02-20	10	-53/+145
\|\ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: doc/src/declarative/advtutorial1.qdoc
\| * \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml into ↵	Qt Continuous Integration System	2010-02-19	9	-52/+104
\| \|\ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-qml: (81 commits) Revert "Speed up QmlGraphicsItem::setParentItem." Fix dynamic example More strict type checking of ListElement properties. Fix tst_QmlGraphicsLoader::networkRequestUrl autotest. Fix tst_qmlgraphicstextedit::delegateLoading autotest Delete the QmlImageRequestHandler in the correct thread. Fix "AnimatedImage ignores Anchors setting" Remove unused function that breaks build on AIX. doc Add support for startDragDistance in qmlviewer. Add pixmap benchmarks and make cached rounded rect the same as Rectangle. Make QmlDom API internal Compile fix with namepaces Doc: reformulate why we build a button Removed incorrect Q_UNUSED() macro from QmlPropertyAnimation::transition Doc: onExited, onEntered only work when button pressed or hoverEnabled Ensure visibleIndex and currentIndex are updated on itemsMoved(). QmlView API review. See QmlChanges.txt for details. Fix example after introduction of RotationAnimation. Animation doc fix. ...
\| \| * \| \| \| \| \| \|	doc	Warwick Allison	2010-02-19	1	-2/+5
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt	Martin Jones	2010-02-18	56	-1059/+2410
\| \| \|\ \ \ \ \ \ \ \| \| \| \| \|_\|_\|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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
\| \| * \| \| \| \| \| \|	Doc: reformulate why we build a button	Henrik Hartz	2010-02-18	1	-2/+3
\| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-qml	Martin Jones	2010-02-18	2	-46/+44
\| \| \|\ \ \ \ \ \ \
\| \| \| * \| \| \| \| \| \|	Get rid of the matchProperties/properties distinction, as it	Michael Brasser	2010-02-18	2	-46/+44
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	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.