Reviewing merge request #441: Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.

The documentation for QEvent did not mention QGraphicsSceneDragDropEvent, which made it necessary to read Qt's code or look for other examples, to find out how to get information about that drag operation in a QGraphicsScene from within an eventFilter().

Requested by: Bastian Bense
Status: Merged
Source repository: random-fixes:master
Target repository: qt:master
Created at: January 22nd, 2010 11:00

Commits that would be merged:

Version 1

Version 1

8cb83f3
Select commits…

	931ede8 Simon Hausmann about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	c57dcf1 Simon Hausmann about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	cf54fab Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into qt-integration
	3ed4276 Gareth Stockwell about 2 years ago	Added error strings to Phonon MMF backend
	dfa9343 Gareth Stockwell about 2 years ago	Fixed bug which caused Phonon backend error messages to be suppressed
	7661f40 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into qt-integration
	9643472 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
	0a52079 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
	add4d83 David Boddie about 2 years ago	Doc: Added links to missing examples and placeholder documentation.
	4b09e47 David Boddie about 2 years ago	Doc: Whitespace fix.
	8577da4 David Boddie about 2 years ago	Doc: Fixed license information as requested by Legal.
	0ec20e4 David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	319e6ca Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into qt-integration
	3d4f904 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
	f4f28a0 Oswald Buddenhagen about 2 years ago	Don't forget to append current $MAC_CONFIG_TEST_COMMANDLINE when setting the SDK to use.
	363f6f2 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
	db782f7 Frans Englich about 2 years ago	Symbian: More i18n strings work.
	74b0c48 David Boddie about 2 years ago	Doc: Fixed references to "old" 2.x and "new" 3.x font name conventions.
	5f39895 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
	99b10b6 Gareth Stockwell about 2 years ago	Removed stale TODO comments from Phonon MMF backend
	bbab8ea Gareth Stockwell about 2 years ago	Phonon MMF: leaves during object construction throw exceptions
	f27198e Gareth Stockwell about 2 years ago	Merge branch 'mmfphonon' of scm.dev.nokia.troll.no:qt/qt-s60-public into mmfphonon
	adef8ff ck about 2 years ago	Assistant: Fix race condition in index creation.
	3117e3a Gareth Stockwell about 2 years ago	Added support for streaming playback to Phonon MMF backend
	bed33ac Gareth Stockwell about 2 years ago	Implemented buffer status notifications in Phonon MMF backend
	66b7657 Gareth Stockwell about 2 years ago	Changed call sequence of seeking in Phonon MMF backend, for streaming
	946dede Gareth Stockwell about 2 years ago	Mediaplayer: enqueue all entries from .ram file before starting playback
	89e1e7f Gareth Stockwell about 2 years ago	Implemented support for playlist handling in Phonon MMF backend
	fe5b275 Gareth Stockwell about 2 years ago	Re-emit prefinishMarkReached and aboutToFinish if rewound back past mark.
	8e21fc6 Gareth Stockwell about 2 years ago	Removed dead code from Phonon MMF backend
	3f648dc Gareth Stockwell about 2 years ago	Implemented node disconnection in Phonon MMF backend
	f906c03 kh1 about 2 years ago	Fix broken delete key, some cleanup.
	3341880 David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	a8ce59c Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
	970f19b Thiago Macieira about 2 years ago	Fix crash in QDBusPendingReply/QDBusReply in case of unconnected calls.
	a405437 Miikka Heikkinen about 2 years ago	Access to image needs to be protected in QS60PixmapData
	ae8a4cf Miikka Heikkinen about 2 years ago	Missing library added to QStringList benchmark for Symbian builds
	be927c3 Sami Merilä about 2 years ago	QS60Style: Do not let QCommonStyle draw PE_PanelScrollAreaCorner
	4d9ef7c axis about 2 years ago	Rewrote most of the regular pointer handling.
	0160b43 Jarek Kobus about 2 years ago	Update polish translations
	6db765d Miikka Heikkinen about 2 years ago	Fixed "make run" target for targets with special characters in them.
	8d79036 Miikka Heikkinen about 2 years ago	Fixed containers-sequential benchmark for Symbian
	e355ade Sami Merilä about 2 years ago	List item is not highlighted before navigating the list
	c8ac041 Harald Fernengel about 2 years ago	Fix .gitignore to not ignore qdoc.pro
	b544eb4 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
	2fa94ee axis about 2 years ago	Can't delete selected characters from FEP using backspace touch button.
	9fd1171 Morten Johan Sørvig about 2 years ago	Fix crash in QFontDialog::getFont() on Mac 10.4
	bfe12d2 Friedemann Kleint about 2 years ago	Designer: Handle "visible"-properties of item view headers correctly.
	14c1572 ck about 2 years ago	Assistant: Add documentation for -remove-search-index.
	c028faa Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
	1bbb6e4 Jason McDonald about 2 years ago	Add a mkspec for selecting gcc-4.0 on Mac OS X.
	19e406c axis about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
	8a09d0d Miikka Heikkinen about 2 years ago	Made QFile benchmark compile and run for Symbian
	ce9a43b Sami Merila about 2 years ago	QS60Style: Slider groove is incorrect
	57a4d82 Sami Merila about 2 years ago	QS60Style: Style does not support pressed state for sliders
	dacbb8b Jarek Kobus about 2 years ago	Update Polish translations
	69e8626 Aleksandar Sasha Babic about 2 years ago	Slow spinbox on N95 when using keys Up/Down
	d1fd7e6 Sami Merila about 2 years ago	QS60Style: Groove changes caused build break of S60 3.1
	03ceb72 Sami Merila about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
	bf8e5ae Sami Merila about 2 years ago	QS60Style: Theme graphics for QSlider in 3.1
	8f28b68 Aleksandar Sasha Babic about 2 years ago	qreal-ization
	5b7e896 Aleksandar Sasha Babic about 2 years ago	qreal-ization
	b77bd00 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
	1860aa7 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into qt-integration
	b1906f0 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into qt-integration
	4f3a6db Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into qt-integration
	abbfbda Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into qt-integration
	b2f4c48 Miikka Heikkinen about 2 years ago	Skipped the most memory intensive tests in QByteArray benchmark.
	dff377e Friedemann Kleint about 2 years ago	Designer: Show actions in action editor in QKeySequence::NativeText
	0f18542 Martin Smith about 2 years ago	doc: Fixed erroneous qdoc error message.
	83d333a Sami Merila about 2 years ago	FEP indicator shown in status pane when it should not
	2c6749c Miikka Heikkinen about 2 years ago	Fixed QGraphicsView benchmark for Symbian.
	693ad0f Samuel Rødal about 2 years ago	Improved raster blur implementation.
	be525c7 Samuel Rødal about 2 years ago	Optimize QGraphicsItemEffectSourcePrivate::pixmap() for QGraphicsPixmapItems.
	8bbb0e7 Samuel Rødal about 2 years ago	Fixed bug in QGraphicsPixmapItem shortcut for graphics effects.
	21c31b4 Samuel Rødal about 2 years ago	Added InvalidateReason to invalidateCache to optimize effects
	b543f35 Samuel Rødal about 2 years ago	Fixed bug in graphics effects caching of graphics item hierarchies.
	9c4a790 Samuel Rødal about 2 years ago	Optimized blur / drop shadow effects for the GL 2 paint engine.
	19a2bd4 Tom Cooksey about 2 years ago	Add "nocopy" mode for seperate-debug-info to configure
	e45b9b4 Tom Cooksey about 2 years ago	Make mkspec/unsupported/linux-host-g++ use correct include
	df512b3 ninerider about 2 years ago	Compilation fix for Windows Mobile
	7e9e5bc ninerider about 2 years ago	Removed the chip demo for windows CE
	a72468e ninerider about 2 years ago	Test fixed for Windows CE.
	adba8e0 Markus Goetz about 2 years ago	QNAM Code: Do not re-abort or continue processing notifications.
	2ba459c mae about 2 years ago	QPlainTextEdit scrolling issue with folded paragraphs
	74bec87 Olivier Goffart about 2 years ago	Fix QMetaObject::connect and disconnect with "dynamic signals"
	3694913 Olivier Goffart about 2 years ago	Merge commit 'origin/4.6' into 4.6
	2fe3395 David Boddie about 2 years ago	Doc: Minor fixes to language.
	ad4ca21 David Boddie about 2 years ago	Doc: Fixed an image reference.
	a068f6d David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	cd0c493 Benjamin Poulain about 2 years ago	Change some examples of Webkit to create the mainwindow on the stack
	82ec0a6 Bill King about 2 years ago	(ODBC) Fixes segfault when error string is larger than 256 chars.
	c5ae0ff Rhys Weatherley about 2 years ago	Add an image allocation pool to the OpenVG paint engine
	191a716 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	7a3c595 Thiago Macieira about 2 years ago	Fix compilation on HP-UX 11.11.
	1f4a4cc Denis Dzyubenko about 2 years ago	Optimisations to gesture event filtering.
	44f7c1e Denis Dzyubenko about 2 years ago	Changes to support locale change event for symbian platform
	66d28ef Denis Dzyubenko about 2 years ago	Allow the WM_TASKBARCREATED message through the UIPI filter on Windows Vista and higher
	9305fba axis about 2 years ago	Enabled input method update code for all platforms.
	d6cd6c5 Gabriel de Dietrich about 2 years ago	Clicking on a selected item wouldn't reset the selection anymore.
	1369025 axis about 2 years ago	Merge branch 'mergeRequest-2149' into 4.6-s60
	9f8d3a3 Prasanth Ullattil about 2 years ago	Calling removeToolBar() on native Mac toolbars (Cocoa) causes crash.
	5a1b5fc Miikka Heikkinen about 2 years ago	Fixed qgraphicsview autotest build for winscw.
	a0ce8bb Sami Merila about 2 years ago	QS60Style: Remove layouts with mirrored information
	cfc13a8 Sami Merila about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
	da91832 Eskil Abrahamsen Blomf... about 2 years ago	Fix vertical text centering on Mac OS X
	f6ebcf8 Eskil Abrahamsen Blomf... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
	100ad35 Aleksandar Sasha Babic about 2 years ago	qreal-ization
	4391014 Aleksandar Sasha Babic about 2 years ago	qreal-ization
	8152bd1 Aleksandar Sasha Babic about 2 years ago	qreal-ization
	ebe0c4d Samuel Rødal about 2 years ago	Got rid of unused variable compiler warning.
	d869ec9 Oswald Buddenhagen about 2 years ago	Merge remote branch 'mainline/4.6' into 4.6
	a88cb5b Samuel Rødal about 2 years ago	Attempt at fixing compilation on Symbian.
	acaaf55 Martin Smith about 2 years ago	doc: Final fix. Example image links now display the image.
	4896b8a Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	cc70bff Tom Cooksey about 2 years ago	Add QT_DEBUG_X11_VISUAL_SELECTION to aid debugging X11/EGL
	6b29466 Tom Cooksey about 2 years ago	Fix QGLWidgets created with an alpha channel on X11/EGL
	4b5b748 Peter Hartmann about 2 years ago	fix Cocoa build
	8e504f4 Thiago Macieira about 2 years ago	Merge branch '4.5' into 4.6-staging
	0bde9d7 Tom Cooksey about 2 years ago	Add autotest for creating a QGLWidget with alpha channel
	9f3ae04 Tom Cooksey about 2 years ago	Fix EGL surface leaks when re-parenting QGLWidget on X11/EGL
	802efaf Tom Cooksey about 2 years ago	Fix autotest which checks for sample buffers
	bf634fe David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	2a2dec6 David Boddie about 2 years ago	Doc: Modified the coding style of the Audio Devices example.
	a9d4faa Bill King about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
	b1bec6c Bill King about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
	4866f6a Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	6e52791 axis about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
	0414a73 Olivier Goffart about 2 years ago	Fix moc generated code with dummy Q_PROPERTY
	a43868c Sami Merila about 2 years ago	Long informative texts causes messagebox to grow outside of screen area
	989895e Sami Merila about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
	d0d5d9d Denis Dzyubenko about 2 years ago	Revert "Changes to support locale change event for symbian platform"
	4d34dc6 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	8fdf9f1 Oswald Buddenhagen about 2 years ago	fix build with namespaced qt
	e1706ea Andy Shaw about 2 years ago	Fixes: Ensure QMAKE_LFLAGS+=/MACHINE:X64 works for vcproj files
	0568fb9 Prasanth Ullattil about 2 years ago	Text cursor is not shown properly in line edits on Mac OS X.
	4b81577 Jani Hautakangas about 2 years ago	Fix for QTBUG-4908 SVG transparency rendering problem.
	06034e9 Miikka Heikkinen about 2 years ago	Fixed events benchmark postEvent function
	851344b Miikka Heikkinen about 2 years ago	Fixed qdiriterator benchmark for Symbian
	a2ec72e Miikka Heikkinen about 2 years ago	Fixed qstylesheetstyle benchmark for Symbian
	6b07987 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	f9d962a Denis Dzyubenko about 2 years ago	Do not call macToQtFormat twice in QLocale.
	cc598ec Denis Dzyubenko about 2 years ago	Doc fix: mark QFileOpenEvent::url to be available since 4.6
	6d84ab2 Denis Dzyubenko about 2 years ago	An optimisation to QTextStream
	cbe70d5 Denis Dzyubenko about 2 years ago	Fixed wheel event delivery in graphicsview.
	f763f00 David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	11ec7b3 Rohan McGovern about 2 years ago	Disable benchlibwalltime test.
	c7d3627 Bill King about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
	7371d78 Rhys Weatherley about 2 years ago	Disable depth testing during the 2D QGLWidget::renderText()
	608daaa Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	b745c92 Bill King about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
	65fe21e Bill King about 2 years ago	(OCI) Fixes problem with clobs being handled as binary
	cc5ae2d Rhys Weatherley about 2 years ago	Update FBO docs to describe how QPainter changes the GL state
	7d6af02 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	91cc7d1 Kim Motoyoshi Kalland about 2 years ago	Fixed parsing of svg paths.
	bc01bb1 Bradley T. Hughes about 2 years ago	Avoid timer starvation when handling many X11 events
	dd678f7 Simon Hausmann about 2 years ago	Merge remote branch 'staging/4.6' into 4.6
	274afe7 Prasanth Ullattil about 2 years ago	Stack overflow when closing a Color panel in Cocoa.
	5203626 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	7dcf7e6 Harald Fernengel about 2 years ago	Stop the configuration if the test compiler cannot be found.
	e2ed04b Harald Fernengel about 2 years ago	Configure support for multiple include levels in qmake.conf hierarchy.
	ea8d13b Martin Smith about 2 years ago	doc: Added discussion on connecting signals that have default arg values.
	0236f6a Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	b8a4b36 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	95661ed Simon Hausmann about 2 years ago	Merge branch '4.5' of scm.dev.nokia.troll.no:qt/qt into 4.6
	7698c6d Joerg Bornemann about 2 years ago	Doc: setFeature snippet was in the wrong place
	124a77d Miikka Heikkinen about 2 years ago	Fixed QCoeFepInputContext::widgetDestroyed
	05d1efb Miikka Heikkinen about 2 years ago	WeatherInfo now shows Oslo info upon launch instead of blank screen
	c74d9d9 Volker Hilsheimer about 2 years ago	Doc: fix typo
	ca30ced Tom Cooksey about 2 years ago	GL2Engine: Don't mark brush as dirty if it hasn't changed
	17977f5 Friedemann Kleint about 2 years ago	Designer: Fix compilation with -static on Mac OS X
	face84c Markus Goetz about 2 years ago	Change QHostInfo to use 5 parallel lookup threads
	21eb38c Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	d64c29e Denis Dzyubenko about 2 years ago	Fixed QResource to respect the explicitely set locale
	abdf138 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	bf819a0 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	12a4be8 Bill King about 2 years ago	Cleanup qsqldatabase test case a little bit.
	7c1283f Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	7e22fc0 Kurt Korbatits about 2 years ago	no audiodevices found using QAudioDeviceInfo::availableDevices on Ubuntu
	d31dd9d Kurt Korbatits about 2 years ago	The "audioinput" multimedia example locks up the audio input/output
	eb1f35f Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	a4550c4 Michael Brasser about 2 years ago	Check if the scene exists before attempting to set its focus item.
	87777f7 Rhys Weatherley about 2 years ago	Align GL_RGB lines on a 4-byte boundary when uploading pixmap textures
	4a580b9 Rhys Weatherley about 2 years ago	Prevent access to non-existent memory in triagulating stroker
	371420d Martin Smith about 2 years ago	doc: Fixed typos.
	0d21267 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	b3e3e9c Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	4100b42 Kim Motoyoshi Kalland about 2 years ago	Fixed crash when parsing invalid polygons in svgs.
	f0ee207 Olivier Goffart about 2 years ago	Add Q_OBJECT to QBalloonTip so it can be intreospected by styles.
	37e845d Olivier Goffart about 2 years ago	Optimize QThreadStorage with QVector
	99e1dc9 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
	e84ec05 Markus Goetz about 2 years ago	Add QHostInfo benchmark
	03f28cf Benjamin Poulain about 2 years ago	Improve the performance of the Anomaly browser demo
	1aa7d59 Samuel Rødal about 2 years ago	NEON configure detection and initial blend function implementations.
	a8bdfca axis about 2 years ago	Switched two files to BSD license.
	12e2c90 Martin Smith about 2 years ago	doc: Added a missing \sa command, plus a \l in the text.
	c673c77 axis about 2 years ago	Fixed two incorrect signal connections.
	e581386 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	315c09c Olivier Goffart about 2 years ago	Make sure mappings are created for columns when indexes newly become parents.
	2c4f51c David Boddie about 2 years ago	Doc: Made corrections to documentation style and clarified some points.
	ba7927c David Boddie about 2 years ago	Doc: Fixed comments in a code snippet.
	79a7b64 David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	bc3c352 Aleksandar Sasha Babic about 2 years ago	Fixing compile issue on Windows CE
	d4005e2 Prasanth Ullattil about 2 years ago	Focus frames in mac style gets clipped.
	65a0c8c Martin Smith about 2 years ago	doc: Added an explanatory \note about the table being sorted.
	82a35ed Olivier Goffart about 2 years ago	Make the layout{,AboutToBe}Changed signals in the QSortFilterProxyModel match its source.
	d418a83 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	c8e7e72 Benjamin Poulain about 2 years ago	Fix a bug in resizing the anomaly browser demo.
	3e7ad7c Thiago Macieira about 2 years ago	Merge branch '4.5' into 4.6-staging
	51be605 Yoann Lopes about 2 years ago	Fixes bug when using AnchorUnderMouse for GraphicsView transformation.
	f708b24 Trond Kjernåsen about 2 years ago	Fixed QPixmap::load() to not modify referenced copies.
	ac3a1e3 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	519d012 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	eda46dc Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	27f8f6e Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	7956bfe Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	2555b0f Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	69e848f Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	c2dca4c Rhys Weatherley about 2 years ago	Fix memory leak of QGLGlyphCoord objects in the OpenGL1 paint engine
	05b1d91 David Laing about 2 years ago	Fix for WinCE compilation of QAbstractSpinBox.
	da46da0 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	f0c5c37 ck about 2 years ago	Assistant: Refactor help engine wrapper.
	072a571 Miikka Heikkinen about 2 years ago	Forwarded return value from QtMainWrapper() to E32Main() exit code.
	3e45dbc Miikka Heikkinen about 2 years ago	RVCT 2.2 compiler can't handle static inline functions with templates.
	71ee64f Sami Merila about 2 years ago	Edit focus should not be lost unless by explicit action
	cba4d93 Carlos Manuel Duclos V... about 2 years ago	Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was being included by src/xmlpatterns.
	beb16e0 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	22573dd Kim Motoyoshi Kalland about 2 years ago	Fixed gradients on text when coordinate mode != logical mode.
	19ce714 Aleksandar Sasha Babic about 2 years ago	Fixing compile error on armcc
	ddf34f3 Lars Knoll about 2 years ago	update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155
	032036b Simon Hausmann about 2 years ago	Warn when calling QFileInfo::absolutePath() on an improper object.
	a0f557d Carlos Manuel Duclos V... about 2 years ago	Adding missing file.
	265f6d0 Aleksandar Sasha Babic about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
	4d20d1f Shane Kearns about 2 years ago	Fixes to winscw def files
	f61a329 Shane Kearns about 2 years ago	Tool for launching symbian apps on the phone from windows command line
	020b10e Prasanth Ullattil about 2 years ago	Drag and drop icon not updated correctly in Cocoa.
	3f0a7ff Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( de77f8ee69c434bde9306c8f407ee2e443a00188 )
	5dfea4d Bill King about 2 years ago	Clean up oracle data type tests.
	2fdff54 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	c6019a5 Rhys Weatherley about 2 years ago	Remove unused legacy code from the jpeg image plugin
	2a20705 Janne Koskinen about 2 years ago	Daylight savings time for Symbian.
	ec19758 Janne Koskinen about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
	36ad4d1 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	495952f axis about 2 years ago	Fixed incorrect headers.
	b2e5e21 Prasanth Ullattil about 2 years ago	Memory leak when using QWidget::setWindowIcon() in Carbon.
	c24da63 Miikka Heikkinen about 2 years ago	Added more specific clean targets for Symbian builds
	bda9a91 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	f5cf559 Miikka Heikkinen about 2 years ago	Changed make sis only require .make.cache if QT_SIS_TARGET is not set.
	875afab Richard Moe Gustavsen about 2 years ago	Cocoa: added release pool
	464306d Richard Moe Gustavsen about 2 years ago	Cocoa: event dispatcher drops events on the floor
	ef5291b Joerg Bornemann about 2 years ago	Doc: remove obsolete Win9x stuff from the documentation
	e60dbc9 Joerg Bornemann about 2 years ago	fix small leftovers from the Win9x removal in the code
	c5e5998 Joerg Bornemann about 2 years ago	remove obsolete QT_WA/QT_WA_INLINE macros
	b97aedb Tom Cooksey about 2 years ago	Fix build with neon instructions enabled but not set in mkspec
	2b4d339 Tom Cooksey about 2 years ago	Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram
	b784d49 Tom Cooksey about 2 years ago	Handle broken shaders better in the GL2 engine's shader manager
	8908c25 Tom Cooksey about 2 years ago	Use 3x3 PMV matrices rather than 4x4 in the GL2 engine
	3b705ed Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	0eabf28 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	6df1c18 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	be2acbc Rhys Weatherley about 2 years ago	Use libjpeg's builtin scaler for implementing setScaledSize()
	762496d Rhys Weatherley about 2 years ago	Add support for ClipRect to the jpeg image plugin
	61f214e Rhys Weatherley about 2 years ago	Implement ScaledClipRect in the jpeg image plugin
	53abbf0 Rhys Weatherley about 2 years ago	Use Mono instead of MonoLSB when writing pbm files.
	03ee83e Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	09cd5f7 Sami Merila about 2 years ago	Device flickers badly when orientation change occurs
	a8c3ed1 Tom Cooksey about 2 years ago	Fix text rendering on GL2 paint engine
	6928ffb Sami Merila about 2 years ago	QWidget with the window flag Qt::Dialog is not decorated as a dialog
	7eb0abe Sami Merila about 2 years ago	Setting background color to a QDialog doesn't work
	a1e716d Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	d2f10da Andreas Aardal Hanssen about 2 years ago	QImageReader: Avoid errorString creation in the normal case
	5c0a117 Andreas Aardal Hanssen about 2 years ago	png: Avoid calling QImage::scanLine(int) from within a loop
	3de1514 Andreas Aardal Hanssen about 2 years ago	gif: 10% speedup on microbenchmark on QImageReader
	b7d95c3 Andreas Aardal Hanssen about 2 years ago	gif: Add unit test for QImageReader::size calls
	6d9d6bf Andreas Aardal Hanssen about 2 years ago	images: Document QImageReader::loopCount behaviour for infinite loops
	51b042f Andreas Aardal Hanssen about 2 years ago	Docs: Amendments to latest changes to QImageReader docs.
	5f7b681 Miikka Heikkinen about 2 years ago	Changed autodetection logic for stlport version and sqlite in Symbian
	0e03f6b Jørgen Lind about 2 years ago	Get rid of no_cast_from_ascii warning
	d27006b Jørgen Lind about 2 years ago	Read QWS_SIZE from layer rather than screen
	01cf310 Janne Koskinen about 2 years ago	Revert "Daylight savings time for Symbian."
	c0a4c26 Janne Koskinen about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
	4376f88 Joerg Bornemann about 2 years ago	Revert "remove obsolete QT_WA/QT_WA_INLINE macros"
	e416e8b Joerg Bornemann about 2 years ago	revert f36fb8b2b63b3734cc2bd66b329ca4fef1204845
	2df5bd1 Sami Merila about 2 years ago	QComboboxes are squeezed in QVGA screens
	0c21eed Sami Merila about 2 years ago	Correcting white space in QS60Style
	2751cdb Sami Merila about 2 years ago	Minor optimization for QS60Style
	cc39141 Bill King about 2 years ago	Merge branch '4.6' of git://scm.dev.nokia.troll.no/qt/qt into 4.6
	a1c15dd Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	a0fb340 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	65313ba Thiago Macieira about 2 years ago	Add two new mkspecs for SunCC with stlport.
	90f22ce Thiago Macieira about 2 years ago	Fix build on ARMv6 when NEON is detected.
	7a0fb84 Thiago Macieira about 2 years ago	FTBFS on hurd-i386 because since clock_gettime is not available there
	a87c7d4 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	11c2d1e Thiago Macieira about 2 years ago	Add missing license headers to the new solaris-cc-stlport mkspecs.
	e6f6ba9 Thiago Macieira about 2 years ago	Fix warning on 64-bit build with MSVC.
	63bd10a Thiago Macieira about 2 years ago	Don't include dlfcn.h unconditionally.
	444fb94 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	fdfb48b Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	1a1eeba Thiago Macieira about 2 years ago	Merge branch '4.5' into 4.6-staging
	2427055 Thiago Macieira about 2 years ago	Merge branch '4.6'
	3f74384 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	6aa95df Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	33985fb Thiago Macieira about 2 years ago	Fix D-Bus marshalling of booleans in optimised code.
	77900eb Thiago Macieira about 2 years ago	Merge branch '4.5' into 4.6-staging
	7f181b6 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	f9ceaa5 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	9709b10 Tom Cooksey about 2 years ago	Move the 0.5 offset we add for aliased rendering to updateMatrix()
	266119b Miikka Heikkinen about 2 years ago	Using qt.iby no longer requires emulator deployment to be done
	b063135 Tom Cooksey about 2 years ago	Lots of mostly cosmetic cleanups to GL2 paint engine
	6e90192 Olivier Goffart about 2 years ago	QStyleSheetStyle: Fixed some text croped when having padding with native border.
	48d2b51 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	d0c3d97 Olivier Goffart about 2 years ago	Fix tst_QFileInfo::isHidden_data on Windows
	8c306f8 Olivier Goffart about 2 years ago	QUrl::toEncoded() fix for the case of "password, but no username".
	84f1003 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	4bd7e69 Trond Kjernåsen about 2 years ago	Fixed a copy-paste error in QRasterPixmapData::metric().
	56ccbf0 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	337931b Miikka Heikkinen about 2 years ago	Removed QtWebkit.dll from Qt.sis in Symbian builds
	03baad5 Olivier Goffart about 2 years ago	Fixes crash when widget with WA_StaticContents child become toplevel.
	8ebad80 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	f5d106e Tom Cooksey about 2 years ago	Remove pointless const's from functions (internal API)
	3185723 Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( eb1c86da9f5fa43a0e126ef58ab11cbd4d200af7 )
	c1ccf9b Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	4bc5082 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	a4f231e Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	698bbbe Adrian Constantin about 2 years ago	For maemo, do not strip the binaries during the installation.
	a845480 Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( c07df5686b431aa5d11643d00308d8f8f59d88b1 )
	5ac2736 Simon Hausmann about 2 years ago	Symbian build fix
	1f1b37e Tom Cooksey about 2 years ago	Track which vertex attrib arrays are enabled in QGLContextPrivate
	16b4182 Tom Cooksey about 2 years ago	Remove superfluous enable/disable vertex arrtib arrays
	2600fd4 Yoann Lopes about 2 years ago	Fixes painting artifacts when using CacheBackground in a QGraphicsView.
	5394052 Trond Kjernaasen about 2 years ago	Fixed QGLWidget::renderText().
	775339c Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 70b5989bdeea2f73bd950099fc0f0e954550ef54 )
	f005fb5 Tom Cooksey about 2 years ago	fix a memory leak in QGLEngineSharedShaders
	f953b7c Tom Cooksey about 2 years ago	Also delete blitShader & simpleShader in ~QGLEngineSharedShaders
	51c4571 Pierre Rossi about 2 years ago	Fix background brush for character format when writing to ODF document.
	ec0e762 Benjamin Poulain about 2 years ago	Update the scrolling code of FlickCharm
	cd63a4c Tom Cooksey about 2 years ago	Fix configure's error message to report correct OpenGL qmake vars
	e5c5213 Kim Motoyoshi Kalland about 2 years ago	Format qOpenGLVersionFlagsFromString() according to Qt coding style.
	592dc59 Kim Motoyoshi Kalland about 2 years ago	Added support for OpenGL up to version 3.2 on Windows.
	33a23c4 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	0a2c688 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	75a1c11 Thiago Macieira about 2 years ago	Update debug output to show the connection's ptr and thread
	988decb Thiago Macieira about 2 years ago	Change the QtDBus watched service list to a map to its owner.
	200413f Thiago Macieira about 2 years ago	Use the watched service name list in matching incoming signals too.
	06bdf48 Thiago Macieira about 2 years ago	Remove the need to know the service owner when adding/removing signal rules.
	fbccab4 Rhys Weatherley about 2 years ago	Reset the OpenVG scissor after a native painting call-out
	b0e7ef2 Rhys Weatherley about 2 years ago	Avoid deep QImage copies in the OpenVG paint engine
	4c48661 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	eb94abb Rhys Weatherley about 2 years ago	Set serial number in QX11PixmapData::transformed
	44065fd Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	d1846e0 Tom Cooksey about 2 years ago	New lance test for checking aliased vs antialiased rendering
	ec452c7 Richard Moe Gustavsen about 2 years ago	Cocoa: app menu does now show before doing qApp::exec()
	e3e0a7a Jørgen Lind about 2 years ago	Set serial number in QDFBPixmapData::transformed
	cdebdfc Jørgen Lind about 2 years ago	Make stretchblit an opt-out option in DirectFB
	c855c61 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	1a1f781 Gunnar Sletta about 2 years ago	fixed typo in qpainter docs
	5356d37 Richard Moe Gustavsen about 2 years ago	Carbon: compile fix
	1e79222 Tom Cooksey about 2 years ago	Introduce new "snapToPixelGrid" flag to GL2 engine for drawText
	81d06f7 Kim Motoyoshi Kalland about 2 years ago	Fixed QGLFormat::operator== to handle new fields.
	8f9b2a0 Richard Moe Gustavsen about 2 years ago	Mac: qcolordialog autotest fails.
	f46115c Oswald Buddenhagen about 2 years ago	do not accumulate messages
	5b0945a Friedemann Kleint about 2 years ago	Designer: Selection handles disappear when using style sheet on form.
	0e4c548 Martin Smith about 2 years ago	doc: Removed a const from a declaration in the example.
	35cb81f Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	d6d9c2a Gunnar Sletta about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
	4cfb341 Samuel Rødal about 2 years ago	Slight performance improvement in comp_func_SourceOver.
	00db09c Friedemann Kleint about 2 years ago	Designer: Enable seconds editing for Q[Date]TimeEdit's properties.
	a47e2de Markus Goetz about 2 years ago	Remove TEST_QNETWORK_PROXY define from the tests
	44f7b73 Miikka Heikkinen about 2 years ago	Updated sis file names and related content in Symbian installation docs
	5153767 Richard Moe Gustavsen about 2 years ago	Cocoa: added release pool
	bc1ca85 Markus Goetz about 2 years ago	tst_qtcpserver: Move benchmarks
	22bc54c Martin Smith about 2 years ago	doc: Fixed remaining qdoc errors
	ad227d0 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	2176a58 Richard Moe Gustavsen about 2 years ago	Cocoa: exec() on a dialog with Qt::Tool windowflag is just a dialog.
	0e94349 Shane Kearns about 2 years ago	Deal with test cases that crash or hang
	10ca680 Markus Goetz about 2 years ago	tst_qhostinfo benchmark: Fix license header
	2a988be Markus Goetz about 2 years ago	Fix typo in QFSFileEnginePrivate::canonicalized
	5c2d319 Alexis Menard about 2 years ago	Make the ShowDirsOnly option work in QFileDialog.
	741a5b0 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	f019f3c Rhys Weatherley about 2 years ago	BitsPerSample should default to 1 in TIFF files.
	619392c Rhys Weatherley about 2 years ago	Remove QGLShareRegister and transfer its functionality to QGLContextGroup
	b72d504 Bill King about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
	4520a64 Bill King about 2 years ago	(ODBC) Handle drivers that return SQL_NO_DATA for exec success.
	d307ece Bill King about 2 years ago	(mysql) Add test to the system so it's there for use later.
	b1b8ff4 Morten Johan Sørvig about 2 years ago	Don't use QPointer in objectve-c interfaces.
	6893e32 Tom Cooksey about 2 years ago	Move QGLTextureGlyphCache into it's own file
	617773f Gunnar Sletta about 2 years ago	fix compilation in GL2 paint engine for Windows
	049f65b Martin Smith about 2 years ago	doc: Clarified next and previous activation order.
	dc50ba5 Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 5d691a1c283938dfbdf891883d8cff8a6ef040bf )
	c08789f Martin Smith about 2 years ago	doc: Clarified which values were added in Qt 4.4.
	d00a226 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	fee4ec0 Martin Smith about 2 years ago	doc: Fixed typo.
	0dc7587 Miikka Heikkinen about 2 years ago	Minor logic fix to Symbian generator in qmake
	d14ac99 Olivier Goffart about 2 years ago	Implement QScript::QObjectDelegate::getOwnPropertyDescriptor
	e715a7f Olivier Goffart about 2 years ago	QScript: Lookup the native setter from the prototype
	553e0ca Martin Smith about 2 years ago	doc: Replaced usses of rootState() with state machine pointer.
	3f8eaba Alexis Menard about 2 years ago	Fix auto-test failure on Windows
	1ae7c8d Miikka Heikkinen about 2 years ago	Fixed "run" makefile target documentation for Symbian
	547e117 Friedemann Kleint about 2 years ago	Changelog: Added Designer/uic entries for 4.6.1
	ea55f9b Olivier Goffart about 2 years ago	Fix test: The bug is now fixed
	3c6d154 Trond Kjernåsen about 2 years ago	Removed temporary QGLWidget created during QGLWidget/X11 initialization.
	190f45b Martin Smith about 2 years ago	doc: Added note explaining grabMouse() for Cocoa and Carbon.
	d03475b Markus Goetz about 2 years ago	Small optimization in QIODevice::readAll()
	94c2fce Martin Smith about 2 years ago	doc: Added some missing macro descriptions.
	2f42f8e Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	3d16f0d Morten Johan Sørvig about 2 years ago	Remove obsolete XShape configure warning.
	6abee18 Morten Johan Sørvig about 2 years ago	Remove the entire warning, is seems it was only there for
	66275bc Miikka Heikkinen about 2 years ago	Fixed Symbian application deployment instructions
	bb34285 Olivier Goffart about 2 years ago	Compile with QT_NO_DOCKWIDGET
	b8f7ada Thomas Zander about 2 years ago	Make unit test more robust
	43a9da5 Jan-Arve Sæther about 2 years ago	Fixed a bug with distribution of spans.
	884c729 Jan-Arve Sæther about 2 years ago	Fix typo in autotest testcase name.
	f721654 Denis Dzyubenko about 2 years ago	Prevent a crash when creating an inputContext from the QApplication dtor.
	afcdce4 Jan-Arve Sæther about 2 years ago	Merge branch 'QT-2261' into 4.6
	b167c8b Alexis Menard about 2 years ago	Display broken symlinks in the filesystem model.
	5226603 Friedemann Kleint about 2 years ago	uic3/uic: Ignore buttonGroupId property when there is no parent QButtonGroup
	e93f6fa Thiago Macieira about 2 years ago	Merge branch '4.5' into 4.6-staging
	dbc4a07 Thiago Macieira about 2 years ago	Merge branch '4.6'
	f124538 Kurt Korbatits about 2 years ago	Added setChannelCount() to QAudioFormat.
	80d4a49 Kurt Korbatits about 2 years ago	Frequency to SampleRate and channels to channelCount.
	965d0b4 Martin Smith about 2 years ago	doc: Fixed references to currsor position().
	1520af5 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	b0fd5e8 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	1f46cf2 Markus Goetz about 2 years ago	QAbstractSocket: Warn when wrong QHostInfo was received
	65bbfb0 Markus Goetz about 2 years ago	QAbstractSocket: Fix warnings when compiling with QABSTRACTSOCKET_DEBUG
	9cdeb6c Martin Smith about 2 years ago	doc: Clarified that the scene owns its items and destroys them.
	f2a96fb Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	3062035 Olivier Goffart about 2 years ago	Document the QGraphicsView::IndirectPainting flag
	d149a3f Olivier Goffart about 2 years ago	Don't call invalidate when resetting the QSortFilterProxyModel.
	9bb45b1 Martin Smith about 2 years ago	doc: Clarified that .lnk files are System files on Windows.
	0252964 Markus Goetz about 2 years ago	QHttpSocketEngine: Remove unneeded code
	86e656c Trond Kjernåsen about 2 years ago	Improved initial startup time for a QGLWidget ontop of EGL/X11.
	fac8aa6 David Boddie about 2 years ago	Doc: Improved the advice about deployment of plugins.
	e625c86 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	7e77574 Thiago Macieira about 2 years ago	GCC doesn't like comment lines ending in \
	7fc53c1 Thiago Macieira about 2 years ago	Change from std::pair to QPair.
	e2baf96 Thiago Macieira about 2 years ago	Fix compilation breakage caused by merge.
	b13ede3 Jason McDonald about 2 years ago	Fix license check failure.
	53817eb Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 865abd2871c801c1d3d0f4eebd985b2daab89ebe )
	e727467 Morten Johan Sørvig about 2 years ago	Make Qt use Cocoa by default on Mac OS X
	59a2ed5 Thomas Zander about 2 years ago	Don't write out fo:word-spacing if its the default value.
	e8b3def Kent Hansen about 2 years ago	Fix QT_NO_CONTEXTMENU
	6f173f9 Morten Johan Sørvig about 2 years ago	Select Carbon when building on 10.4 Tiger.
	982cffb David Boddie about 2 years ago	Doc: Made coding style changes to the Audio Input and Output examples.
	d63accf Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	a628b55 David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	73b7ff3 Martin Smith about 2 years ago	doc: Clarified that .lnk files are System files on Windows.
	0de487a Alexis Menard about 2 years ago	Fix default filter selection when using HideNameFilterDetails option.
	6c7b880 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	051bfa1 Thiago Macieira about 2 years ago	Remove warning "statement with no effect"
	e273478 Martin Smith about 2 years ago	doc: Clarified activeSubControls and subControls.
	2f8e66b Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	da19e7f Jason McDonald about 2 years ago	Update copyright year to 2010
	b1327ab Tom Cooksey about 2 years ago	Revert "Add GLfloat[2][2] & GLfloat[3][3] uniform setters to QGLShaderProgram"
	a24d87f Jason McDonald about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	7049688 Denis Dzyubenko about 2 years ago	Fixes a crash when setting focus on a widget with a focus proxy.
	216adf3 Gareth Stockwell about 2 years ago	Merge branch 'mmfphonon' into 4.6
	a6eb1a3 Alexis Menard about 2 years ago	Use QFile:rename when moving items in QFileystemModel.
	092f201 Olivier Goffart about 2 years ago	Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border."
	94759a0 Gabriel de Dietrich about 2 years ago	QBoxLayout::setGeometry would not respect the widget min/max width
	bd01114 Thiago Macieira about 2 years ago	Use the lowercase/shortname.h headers for Phonon includes
	72adb8f Thiago Macieira about 2 years ago	Remove special Phonon processing from syncqt.
	0fb1511 Thiago Macieira about 2 years ago	Attempt at readding the capital P headers for Phonon
	f878055 Denis Dzyubenko about 2 years ago	Fixed qxmlstream autotest when using shadow builds.
	5529a35 Denis Dzyubenko about 2 years ago	Temporary hackiesh solution to prevent BOM in the xml data.
	859bc19 Markus Goetz about 2 years ago	QIODevice: Fix readAll()
	2399046 Alexis Menard about 2 years ago	Fix build on other platforms than Mac
	69bc7ba Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	a8e3cca Alexis Menard about 2 years ago	Our variables are our variables so we prefix them.
	0647ea3 Joerg Bornemann about 2 years ago	Qt 5 comment added for QT_WA / QT_WA_INLINE removal
	8fe7f13 Oswald Buddenhagen about 2 years ago	remove dead code
	f562d30 Oswald Buddenhagen about 2 years ago	tidy up the test .pro files
	9e61045 Oswald Buddenhagen about 2 years ago	clean up the lupdatecmd files
	79f1414 Oswald Buddenhagen about 2 years ago	no point in specifying -ts when a .pro file is specified
	14fc114 Oswald Buddenhagen about 2 years ago	fix number heuristics, part 1
	2bd2e35 Oswald Buddenhagen about 2 years ago	fix sametext and number heuristics
	1ee6d3d Oswald Buddenhagen about 2 years ago	look for the .result file in the dir where the output is expected to go
	a54a896 Oswald Buddenhagen about 2 years ago	move equivalent of output_ts test to good/
	40e3c68 Oswald Buddenhagen about 2 years ago	don't use qmake for test setup
	b1b6b0a Oswald Buddenhagen about 2 years ago	make the lupdate tests more verbose in case of failure
	7a5bca8 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	80e6ea3 Rhys Weatherley about 2 years ago	Avoid a deep copy of QImage::bits() in the png writer
	58112b1 Rhys Weatherley about 2 years ago	Add QImage::constBits() and QImage::constScanLine()
	eb3da7d Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	f9ffe24 Justin McPherson about 2 years ago	Fix warning in qfilesystemmodel_p.h
	b63cfd1 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	a3c1b07 Justin McPherson about 2 years ago	Merge branch '4.6' of ../../4.6 into 4.6
	51f92c1 Thiago Macieira about 2 years ago	Improve QUrl constructing performance by making empty URLs have d==0.
	089ee70 Thiago Macieira about 2 years ago	Make an empty QUrl also be considered non-detached (d == 0).
	2e4c779 Trond Kjernåsen about 2 years ago	Remove unnecessary call to QWidget::setAttribute().
	4d786b6 Richard Moe Gustavsen about 2 years ago	Cocoa: problems quitting application when not using qApp::exec
	828b129 Denis Dzyubenko about 2 years ago	Fixes a crash when destroying and creating QApplication.
	5339d24 Prasanth Ullattil about 2 years ago	QMenuBar::triggered(QAction *) fires twice in Mac (carbon).
	5bf6197 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	45af493 Martin Smith about 2 years ago	doc: Added enum values to table for Qt 4.5 and 4.6.
	f165563 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	443d2f2 Samuel Rødal about 2 years ago	Fixed bug in boxes demo occuring with certain OpenGL drivers.
	60d27f4 Miikka Heikkinen about 2 years ago	Added UIDs and icons to some webkit examples
	0abf84b Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( b217cdfedc7b5e7581325bda718192247f03dd5d )
	52ecb29 Martin Smith about 2 years ago	doc: Corrected parameter value in snippet.
	45088f4 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	d401e8b Simon Hausmann about 2 years ago	Prospective Qt/Mac build fix
	63e248a Prasanth Ullattil about 2 years ago	Mac style doesn't honour QStyle::State_HasFocus for non-widgets.
	9701f97 ck about 2 years ago	Assistant: Add doucmentation for -rebuild-search-index option.
	86bb9a9 Martin Smith about 2 years ago	doc: Removed incorrect \inmodule command.
	e2f2765 Miikka Heikkinen about 2 years ago	Separated "make run" and "make runonphone" targets
	f4e633a Trond Kjernåsen about 2 years ago	Fixed indentation and typo.
	55c983e Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	ce5f772 David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	6026436 Alexis Menard about 2 years ago	Fix performance regression in _q_polishItems.
	f8e0841 Trond Kjernåsen about 2 years ago	Reset the GL stencil mask, op and function in resetGLState().
	784374a Miikka Heikkinen about 2 years ago	Deploy sqlite3.sis instead of sqlite3.dll in Symbian
	3b57425 João Abecasis about 2 years ago	Avoid double-buffering in QFile
	6bf1674 João Abecasis about 2 years ago	Don't drop errors from flush on QFile::close
	183be53 João Abecasis about 2 years ago	Fix bugs evidenced by change to keep flush errors on QFile::close
	3e0d30c Thiago Macieira about 2 years ago	Autotest: rename test with typo in the name
	2dde31f Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	0d97775 David Boddie about 2 years ago	Doc: Added license information for the Symbian version of qtmain.
	5d03f94 David Boddie about 2 years ago	Doc: Added the QAudio namespace to the multimedia module documentation.
	7db366a David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	a010d26 Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 99ccc1c3e4db5354246720f9b9aa3d282e64497d )
	23f9444 João Abecasis about 2 years ago	make it possible to retrieve name of the user who owns the file
	c24d701 João Abecasis about 2 years ago	fix styling; improve readability
	428a624 João Abecasis about 2 years ago	improve readability a bit more
	751de82 João Abecasis about 2 years ago	Avoid repeatedly calling LookupAccountSid in QFSFileEngine::owner
	785767e Pierre Rossi about 2 years ago	Fix a painter warning
	1ff8e5a Oswald Buddenhagen about 2 years ago	don't complain about unresolved base when the reference is absolute
	a25fbb9 Oswald Buddenhagen about 2 years ago	fix test under windows
	fcf3c50 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	dbbf451 Kurt Korbatits about 2 years ago	QAudioInput loses data on Maemo5/other linux platforms.
	3f3e86d Kurt Korbatits about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
	118e7a8 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
	4c17c3b Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	4378b16 Jani Hautakangas about 2 years ago	Fix for QTBUG-5870 QGraphicsProxyWidget does not show children on
	6e99e7c Simon Hausmann about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
	73f7772 Thiago Macieira about 2 years ago	QNAM HTTP: fix the caching algorithm from RFC 2616
	e49aee9 Thiago Macieira about 2 years ago	QNAM HTTP: change the caching semantics to match documentation
	2f10f91 Thiago Macieira about 2 years ago	QNAM HTTP: just use the expirationDate in the code that validates the cache
	59a8e02 Jan-Arve Sæther about 2 years ago	Don't use QTime::elapsed() on windows to query for the actual time.
	1484008 gunnar about 2 years ago	Make sure the rect in QPixmap::copy() doesn't exceed the boundingRect.
	4f36245 Friedemann Kleint about 2 years ago	Translations: Update German for 4.6.1
	4596db4 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	9b0502a Olivier Goffart about 2 years ago	Fixes: Checked QPushbutton ignores stylesheet backround:
	1f8fa41 Miikka Heikkinen about 2 years ago	Added mention of Symbian binary packages to INSTALL file
	7e5861d Thiago Macieira about 2 years ago	Autotest: add a test for QNAM's HTTP cache handling code
	7362945 Jens Bache-Wiig about 2 years ago	Fixes: MenuItem size fixes and missing separator with Gtk+
	2e62227 Thiago Macieira about 2 years ago	Merge branch '4.6'
	f904720 Jens Bache-Wiig about 2 years ago	Fixes: Setting any style sheet breaks checkbox positioning
	3241938 Shane Kearns about 2 years ago	Enable building with MSVC2008
	bdef1a9 Alan Alpert about 2 years ago	Update changes file
	a54b606 Morten Johan Sørvig about 2 years ago	Fix broken QGLWidget::renderPixmap on Mac/Carbon
	4ba439f Morten Johan Sørvig about 2 years ago	Cocoa: Fix painting errors on QGLWidget resizing.
	3aa77d6 Martin Smith about 2 years ago	doc: Explained parameter value defaults where appropriate.
	2530a32 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	d40219c Jens Bache-Wiig about 2 years ago	Fixes: Fix spinbox with NoButton style in QGtkStyle
	8894467 Martin Smith about 2 years ago	doc: Fixed typos.
	c26e95a Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	bf4ed81 Stefano Pironato about 2 years ago	Add texture glyph width cache default.
	cfc1020 Thomas Zander about 2 years ago	Add new benchmark for some qtext features.
	583b3f5 Simon Hausmann about 2 years ago	Fix passing of arguments to syncqt
	5533c85 Jarek Kobus about 2 years ago	Doc typos fixed
	a518a91 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	5f27c54 Joerg Bornemann about 2 years ago	added CONFIG += console to qlalr.pro
	7fb78e7 Denis Dzyubenko about 2 years ago	Added new functions to QTextCodec that accept ConversionFlags.
	fdac6df Denis Dzyubenko about 2 years ago	Use the new QTextCodec api in the QXmlStreamWriter.
	3b62b33 axis about 2 years ago	Fixed a doc error.
	07b484b axis about 2 years ago	Fixed QDesktopWidget autotest.
	4a84b27 axis about 2 years ago	Added a flag to avoid construction of application panes.
	f0d2a0d Denis Dzyubenko about 2 years ago	Reverted two commits that were pushed to the wrong branch.
	319b026 Alexis Menard about 2 years ago	Obsolete QDirModel and remove it from the doc.
	158d63b Alexis Menard about 2 years ago	Rename files in completer example since QDirModel is not used.
	d93b2ff Denis Dzyubenko about 2 years ago	Added new functions to QTextCodec that accept ConversionFlags.
	2f500df Denis Dzyubenko about 2 years ago	Use the new QTextCodec api in the QXmlStreamWriter.
	a3e6a04 Gareth Stockwell about 2 years ago	Fixed build breakage on S60 3.1 due to audio effects changes
	148401f Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	d3db719 Gareth Stockwell about 2 years ago	Merge commit 'origin/mmfphonon' into 4.6
	48cce37 Olivier Goffart about 2 years ago	Doc: the QTextDecoder need to be destroyed, reflect that in the example
	7d3cdcb Gareth Stockwell about 2 years ago	Fixed typo in Phonon::EffectWidget implementation
	d44c661 Gareth Stockwell about 2 years ago	Corrected parameter name ordering in internal Phonon MMF function signatures
	4c95ec3 Gareth Stockwell about 2 years ago	Implemented audio effects capability querying in Phonon MMF backend
	6ac3701 David Boddie about 2 years ago	Doc: Clarified why a path matches in the example given.
	0cd3782 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	ec82a2e Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	83d9dc8 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	32d84d8 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	e32bb8f Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	f19a82b Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	bbb7312 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	31cc1b3 Michael Brasser about 2 years ago	Correctly determine QScriptValue::isQObject() for QObjects using the
	8d76de9 Bill King about 2 years ago	(Sqlite2) Fix for QTBUG-6421
	9417c6c Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	cb0de81 ck about 2 years ago	Add QT_{BEGIN,END}_NAMESPACE to qtextureglyphcache_gl.cpp.
	d8ad9ac Jani Hautakangas about 2 years ago	Fix for QTBUG-6408 QFontEngineS60::QFontEngineS60 called hundreds of
	6900cf8 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
	9a820c4 Thiago Macieira about 2 years ago	Fix regression introduced in e49aee9f: set If-Modified-Since.
	ef5a985 Thiago Macieira about 2 years ago	Autotest: the cache code no longer returns expired pages.
	56d0ea1 ck about 2 years ago	Update reference to renamed file in completer example.
	8b42e57 Gabriel de Dietrich about 2 years ago	QTreeView::selectAll() wouldn't work when first column hidden
	145fecc Peter Hartmann about 2 years ago	network internals: start HTTP GET requests right away when called
	dbf9e91 Christian Kamm about 2 years ago	Do not set the font size unnecessarily in the simulated s60 style.
	b3ffbdc Simon Hausmann about 2 years ago	[syncqt] Make it possible to override the base directory
	64ce295 Simon Hausmann about 2 years ago	[syncqt] Make it possible to synchronize headers for a separate module
	45fedfe Tom Cooksey about 2 years ago	Track the glVertexAttribPointer and only update it if it's changed
	820db2b Olivier Goffart about 2 years ago	Fix incorrect drawing of the hovered row on QTreeView with some styles.
	039387d Thiago Macieira about 2 years ago	Add a way to access the normalised URL in QUrl.
	af7a0cb Gareth Stockwell about 2 years ago	Shortened description of audio equalizer bands
	51078f1 Martin Smith about 2 years ago	doc: Added clarification about allocating space for the 0 terminator.
	8e2c575 Martin Smith about 2 years ago	doc: Corrected explanation of when append() does nothing.
	e1e67e8 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	22d30bd Simon Hausmann about 2 years ago	[syncqt] Make -separate-module work with WebKit's directory structure
	bbac0f0 David Boddie about 2 years ago	Doc: Added a missing example to the list of Graphics View examples.
	7f83a22 David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	a56a9b9 Peter Hartmann about 2 years ago	network internals: fix build on S60
	7bd7dab Markus Goetz about 2 years ago	QNAM HTTP: Check if socket already tries to connect.
	e2a94ba Markus Goetz about 2 years ago	QNAM HTTP: Optimize eatWhitespace()
	efa02e6 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	a34d372 Olivier Goffart about 2 years ago	Fixes warning in the QMacStyle
	eb84acd Kim Motoyoshi Kalland about 2 years ago	Fixed subpixel antialiased text drawing with the GL2 engine.
	dfcc48e Thomas Zander about 2 years ago	Add odf-writer benchmark.
	36dcdcd Markus Goetz about 2 years ago	QNAM HTTP: Fix readBuffer maximum size.
	f9a6458 Kim Motoyoshi Kalland about 2 years ago	Fixed justify aligned text drawing with the GL1 engine.
	e4f2a7f Gareth Stockwell about 2 years ago	Added comments to clarify usage of Phonon::EffectParameter API
	96827cf Markus Goetz about 2 years ago	QNAM HTTP: Don't call d_func() so often
	4838931 Gareth Stockwell about 2 years ago	Modified effect parameter handling to improve user experience
	d1fe5a2 Thiago Macieira about 2 years ago	fix typo in qreadwritelock's documentation
	02c6e39 Thiago Macieira about 2 years ago	Fix code example
	e533067 Gareth Stockwell about 2 years ago	Delayed creation of audio effect object until audio is initialized
	088e1bc Thiago Macieira about 2 years ago	Added the 'framecapture' WebKit example to the default build.
	894bb6e Gareth Stockwell about 2 years ago	Removed dependency of EffectFactory on native effect headers
	a6592a1 Thiago Macieira about 2 years ago	typo fix
	1a7234e Gareth Stockwell about 2 years ago	Added a macro to reduce boilerplate code in Phonon MMF backend
	f10a3a1 Jani Hautakangas about 2 years ago	Fix for QTBUG-7267 Qs60Style::drawControl() does not align CE_ItemViewItem
	aefcf35 Gareth Stockwell about 2 years ago	Removed unnecessary check in Phonon MMF backend
	581b699 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	e8f45c5 Thiago Macieira about 2 years ago	Autotest: add a local version of the tst_QHttp::connectionClose test
	99acb8f Gareth Stockwell about 2 years ago	Refactored AbstractAudioEffect to reduce redundancy in derived classes
	edbbbe8 Gareth Stockwell about 2 years ago	Implemented bass boost in Phonon MMF backend
	1441255 Markus Goetz about 2 years ago	QNAM HTTP Code: When starting new request, prefer connected sockets.
	8798b36 Joerg Bornemann about 2 years ago	fix release mode crash in qfont.cpp initFontSubst() on Windows mobile
	c69b85e Markus Goetz about 2 years ago	tst_qhttpnetworkconnection: Relax condition in getMultipleWithPriorities
	1b1aab4 Markus Goetz about 2 years ago	tst_qhttpnetworkconnection: Test also HEAD in some tests
	dd68d10 Joerg Bornemann about 2 years ago	warning fixes for platforms, where qreal == float
	d993351 Gareth Stockwell about 2 years ago	Implemented loudness effect in Phonon MMF backend
	bc0e4aa Gareth Stockwell about 2 years ago	Implemented reverb effect in Phonon MMF backend
	f42624c Gareth Stockwell about 2 years ago	Implemented stereo widening effect in Phonon MMF backend
	5a8c0de Gareth Stockwell about 2 years ago	Simplified error handling for audio effects
	24392fb Gareth Stockwell about 2 years ago	Added enable/disable parameter to each effect in Phonon MMF backend
	3efc651 Markus Goetz about 2 years ago	QNAM HTTP Code: Cache socket state inside ensureConnection()
	bf39fbe Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	7abb2cf Rhys Weatherley about 2 years ago	Update changes file with Rhys Weatherley's work.
	f08189b Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	54044ee Gunnar Sletta about 2 years ago	Fix point drawing on raster engine for flat and square caps
	bf71ab6 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	705ebae Morten Johan Sørvig about 2 years ago	Add an autorelease pool to QApplication instance.
	b73b5e5 Morten Johan Sørvig about 2 years ago	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
	bb689ca axis about 2 years ago	Added changelog entries.
	8b56ffe Simon Hausmann about 2 years ago	Prevent a crash when creating an inputContext from the QApplication dtor.
	ab2f88e Simon Hausmann about 2 years ago	Fix compilation of builds without WebKit
	2efba00 Kent Hansen about 2 years ago	doc: update snippets for QtScript function expressions
	55305ee David Boddie about 2 years ago	Doc: Resized the window and added a title.
	a1ec686 Alexis Menard about 2 years ago	Fix completion in QFileDialog.
	10a0134 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	eef74a1 Bradley T. Hughes about 2 years ago	my 4.6.1 changelog contributions
	008bae0 Miikka Heikkinen about 2 years ago	Added absolute path to sqlite3.sis in s60installs.pro
	d1f73b7 Markus Goetz about 2 years ago	Update changelog with some of my stuff
	83e3c46 Oswald Buddenhagen about 2 years ago	print actual rather than expected output for matching text
	72eceed Oswald Buddenhagen about 2 years ago	remove superfluous \r filtering
	bb1b7fc Oswald Buddenhagen about 2 years ago	support regexp-like quantifiers of expected output lines
	273b575 Oswald Buddenhagen about 2 years ago	really fix the autotest
	b4067f4 Oswald Buddenhagen about 2 years ago	remove trimming of (expected) output
	04bdf9f Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( bd6591b4acaf2172ab05702153ef539c0ac89cbb )
	2b50979 Oswald Buddenhagen about 2 years ago	QFile cannot deal with crlf-translated stdio, so use binary mode
	81e1d9a Yoann Lopes about 2 years ago	Update change log with Yoann Lopes work.
	4da1575 Martin Smith about 2 years ago	doc: Updated the descriptions of the connection types.
	c96c83d Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	c90c5b6 Prasanth Ullattil about 2 years ago	Changed log updated
	48b4a79 Kim Motoyoshi Kalland about 2 years ago	Fixed bug where QGLPixmapData::toImage() returned too dark image.
	aed2adc Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	aca933d Richard Moe Gustavsen about 2 years ago	Cocoa: application will not quit when using dialogs
	0e6abff Richard Moe Gustavsen about 2 years ago	Cocoa: the menu bar is sometimes faulty disabled
	b958102 Markus Goetz about 2 years ago	QNAM: Add priority to the API and use it for HTTP
	1b62c32 Gareth Stockwell about 2 years ago	Merge commit 'origin/mmfphonon' into 4.6
	5a4a0af Prasanth Ullattil about 2 years ago	Revert "Fixed qxmlstream autotest when using shadow builds."
	ea24edb Trond Kjernåsen about 2 years ago	4.6.1 changes
	c186438 Samuel Rødal about 2 years ago	Update changelog with my 4.6.1 changes.
	ddd193b Peter Hartmann about 2 years ago	my changelog for 4.6.1
	d4e8180 Gunnar Sletta about 2 years ago	Avoid coordinate limitations in the raster engine.
	30ea9ef Richard Moe Gustavsen about 2 years ago	My changes to changes-4.6.1
	1595d85 Tom Cooksey about 2 years ago	Update changes file for 4.6.1
	2a4a767 Gunnar Sletta about 2 years ago	Put LinesHint into QVectorPath hints to enable further optimizations
	7e87d9d Gunnar Sletta about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
	bc62c67 Kim Motoyoshi Kalland about 2 years ago	Added my changes to the 4.6.1 change log.
	4c85bf2 Alexis Menard about 2 years ago	My changelog for 4.6.1.
	12e320a Gabriel de Dietrich about 2 years ago	Significant digits were lost in QDoubleSpinBox range when changing precision
	4f7ebc2 Thiago Macieira about 2 years ago	Autotest: don't depend on QtGui just because of QDesktopServices::storageLocation
	5895687 Thiago Macieira about 2 years ago	Fix an issue with HTTP headers like "private, max-age=300".
	d09836c Thiago Macieira about 2 years ago	Autotest: set these files to executable. They are CGI scripts.
	a902d9e Jan-Arve Sæther about 2 years ago	My changes
	f71b48c Jan-Arve Sæther about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
	ecef74a Simon Hausmann about 2 years ago	Skip tst_QSystemLock::processes
	58a319f Jens Bache-Wiig about 2 years ago	Fixes: Add some changes for 4.6.1
	152e4ee Thiago Macieira about 2 years ago	Fix D-Bus calls with QDBus::BlockWithGui.
	796f823 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	6088336 Oswald Buddenhagen about 2 years ago	really, really fix the test :}
	22796b3 Thiago Macieira about 2 years ago	Merge branch '4.6'
	4db1405 Pierre Rossi about 2 years ago	Modifies the google chat example to use the DOM API
	c603ca1 Pierre Rossi about 2 years ago	Make compile on HPUX
	1cb8e4b Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	417dd75 Paul Olav Tvete about 2 years ago	Merge remote branch 'qt/4.6' into oslo-staging-2/4.6
	06b5131 Simon Hausmann about 2 years ago	QtWebKit changelog for Qt 4.6.1
	dc2086c Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	a301ccb Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	5acc7d8 Kurt Korbatits about 2 years ago	Fix example in QAudioOutput/QAudioInput docs
	08c3b4b Kurt Korbatits about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6
	72c08d3 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	f8621ac Bill King about 2 years ago	SQL 4.6.1 changelog
	58be75d Bill King about 2 years ago	Update autotest database connection settings
	48e08ee Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
	b38da98 Peter Hartmann about 2 years ago	add a hash function to QUrl, and remove the xmlpatterns specific one
	dd62687 Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8b9165d3bc84d1c8cc7df49a191cc3857b5530d4 )
	826d995 Samuel Rødal about 2 years ago	Fixed tst_qgl multipleFBOInterleavedRendering.
	5099eda Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	3aca005 Oswald Buddenhagen about 2 years ago	Merge remote branch 'mainline/4.6' into 4.6
	15b10bf Andreas Kling about 2 years ago	Remove erroneous warning in QFileInfo::absolutePath()
	42fc59e Thiago Macieira about 2 years ago	My changes for 4.6.1
	737161b Thiago Macieira about 2 years ago	Add an overload of qRegisterMetaTypeStreamOperators without the type name
	8c7e85c Thiago Macieira about 2 years ago	Update my changelog for 4.6.1
	52ecdf5 Richard Moe Gustavsen about 2 years ago	Cocoa: refactor code for clearing the native menu bar
	20e0e7a Richard Moe Gustavsen about 2 years ago	Revert "Add an autorelease pool to QApplication instance."
	cd07723 Martin Smith about 2 years ago	doc: This bug wasn't really a bug; it just required clarification.
	5229ac8 Martin Smith about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	6e5b530 Markus Goetz about 2 years ago	QSslSocket: Remove writeBuffer,readBuffer and use from QAbstractSocket
	e1b03ba Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	82b3e65 Markus Goetz about 2 years ago	tst_qnetworkreply benchmark: Properly finish the thread
	6c56de7 Samuel Rødal about 2 years ago	Improved performance of translating device coordinate graphics effects.
	83ddf9c Samuel Rødal about 2 years ago	Removed pointless image comparison in raster colorize filter.
	a78792c Harald Fernengel about 2 years ago	Use a QTextBrowser instead of a read only QTextEdit
	e946653 Thomas Zander about 2 years ago	Make compile on symbian/Linux
	59ee1b9 Simon Hausmann about 2 years ago	More changelog additions for QtWebKit
	f247315 Iain about 2 years ago	Use MMP keyword, not compiler flags, to update FPU option on Symbian
	d7d67cc Iain about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6
	7bfc32c Trond Kjernåsen about 2 years ago	Rework how Qt handles GL extensions.
	ae5812e Jan-Arve Sæther about 2 years ago	Replace the truncate function with fuzzierCompare().
	06828a0 Jan-Arve Sæther about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
	6921f08 Jan-Arve Sæther about 2 years ago	Disable some tests that require high floating point precision.
	dc5c510 Simon Hausmann about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
	8df5b06 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	7d1e486 Thiago Macieira about 2 years ago	Merge branch '4.6'
	4859202 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into 4.6-integration
	3531f4c Thomas Zander about 2 years ago	Fix rules for recreating the Makefile in a subdir
	cf32ca4 David Boddie about 2 years ago	Doc: Describe QStackedWidget::removeWidget() more thoroughly.
	0193617 David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	4e5dedc Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	862d543 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	6c5454b Kurt Korbatits about 2 years ago	Revert "Added setChannelCount() to QAudioFormat."
	e2f1ae6 Kurt Korbatits about 2 years ago	Revert "Frequency to SampleRate and channels to channelCount."
	5a91631 Kurt Korbatits about 2 years ago	Revert "Frequency to SampleRate and channels to channelCount." missed
	ecd0b17 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
	f17aead Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
	a998a8a Rohan McGovern about 2 years ago	Add a selftest for tests/auto/auto.pro.
	cf74ef2 Simon Hausmann about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
	d8cadc2 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	fac3083 ck about 2 years ago	Use QTemporaryFile for opening documents in external applications.
	6ba1ce5 Markus Goetz about 2 years ago	tst_qnetworkreply benchmark: Read HTTP headers when emulating HTTP
	9baeb2f Trond Kjernaasen about 2 years ago	Fix QGLWidget::renderPixmap() on Windows.
	54d1ad1 ck about 2 years ago	Assistant: Open non-HTML content in external application.
	00ffa3c Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	b095541 Kent Hansen about 2 years ago	add tests for QFlags behavior in QtScript
	e915c24 Prasanth Ullattil about 2 years ago	File dialog mode is not correctly updated in Mac (Cocoa).
	f776780 Peter Hartmann about 2 years ago	network internals: fix uploading of data
	9056392 ck about 2 years ago	Assistant: Extend 54d1ad11a4f35c0484418e5d18537daaccc2c6ab.
	c5a226d Alexis Menard about 2 years ago	Implement showing the volume name for drives on Windows.
	a299057 Alan Alpert about 2 years ago	Make input mask cursor blink
	2ac0b43 Alan Alpert about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6
	b6b3f7b Thomas Zander about 2 years ago	Better fix for build!=src Makefile generation
	1ca42be Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa )
	f894fb8 Simon Hausmann about 2 years ago	Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 8f6992f4e8f027818429d428393b08068eca9ffa )
	cfee61f Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	5baf1a9 Yoann Lopes about 2 years ago	Fixes wrong stroke clipping with the raster engine.
	bc82db4 Jason Barron about 2 years ago	Improve the behavior of expose events on Symbian.
	9b59e3a ck about 2 years ago	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt
	035bb4a ck about 2 years ago	Assistant: Fix bug that can lead to infinite loop in edge cases.
	9fc2d96 ck about 2 years ago	Assistant: Use isLocalUrl() to decide whether a page is internal.
	c6f1e91 Gabriel de Dietrich about 2 years ago	QListView in icon view mode, drop enabled items wouldn't receive anything
	6c5c231 ck about 2 years ago	Assistant: Extend list of file types to open internally.
	0047fd3 Jason Barron about 2 years ago	Enable surface transparency support on Symbian^4.
	88a07b4 Simon Hausmann about 2 years ago	Fix tst_qmlgraphicstext::letterSpacing tst_qmlgraphicstext::wordSpacing Sent for review into 4.6.
	1931d12 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	2d0bd1a João Abecasis about 2 years ago	QFile::remove: don't fail for unrelated errors
	d39f398 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	8f3277d Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	741bcdc Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	24a7ea4 Kurt Korbatits about 2 years ago	Fixed error in unit test xml file.
	4021fae Rohan McGovern about 2 years ago	Remove unused file.
	4b76c78 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
	2d1f2bb Morten Johan Sørvig about 2 years ago	Doc: Cocoa is now the default Mac port.
	9ba9308 Trond Kjernåsen about 2 years ago	Fixed the encoding of the Tile and Creator tags in the PDF engine.
	a0e8b66 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	3f396bd Adrian Constantin about 2 years ago	Adding texture glyph cache default.
	001ebdf Trond Kjernåsen about 2 years ago	Clarify the docs slightly for QPainter::beginNativePainting().
	4c9e8b7 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	27ed53b Richard Moe Gustavsen about 2 years ago	Cococa: QDialogs stays on top when application is not active
	7dee69c Richard Moe Gustavsen about 2 years ago	Cocoa: sub-windows do not stack in front of parents
	7e22fb2 Jens Bache-Wiig about 2 years ago	Fixes: Cosmetic fix for maemo spin box
	ab124ac Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	fdf8273 Trond Kjernåsen about 2 years ago	Avoid an unnecessary copy in QImage::scaled().
	51fe846 David Boddie about 2 years ago	Doc: Added placeholder pages for new examples and updated the overviews.
	13240f5 David Boddie about 2 years ago	Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
	71d9452 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	eccddae Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	a88c85f Simon Hausmann about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
	d59eaf1 Thiago Macieira about 2 years ago	Fix compilation on IA-64 with the Intel compiler: cast properly.
	5346ede Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	9f3bffe Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-team into 4.6-integration
	dcd7c79 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
	c8e54ce axis about 2 years ago	Symbian RnD SDK version pf_5250, wk48 and later (e.g., for ivalo target) has changed /epoc32/include layout, including a subdirectory cal...
	67652ce axis about 2 years ago	Remove qmake warning by using appropriate variable.
	94ceaf3 Shane Kearns about 2 years ago	Describe patch-capabilities in the install instructions.
	7e76201 Andy Shaw about 2 years ago	Fixes: When calling QDesktopWidget::screenGeometry() with a null
	437a67e Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
	4e23d00 Shane Kearns about 2 years ago	Workaround for compiler error with MWCC (Symbian emulator)
	a764519 Qt Continuous Integrat... about 2 years ago	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.6-integration
	f62d047 Thiago Macieira about 2 years ago	Merge branch '4.6'
	61ce98e Kim Motoyoshi Kalland about 2 years ago	Updated painter path caching in the GL2 engine after merge.
	b80ac6d kh1 about 2 years ago	Force the creation of the default collection file directory.
	1969f1f Kim Motoyoshi Kalland about 2 years ago	Changed QBrush::operator== to also compare the brush transforms.
	3d6cfbb Leonardo Sobral Cunha about 2 years ago	Removing unused image from git in qgraphicsitem autotest
	01a54a8 ck about 2 years ago	Assistant: Fix translations.
	6b92cb8 Leonardo Sobral Cunha about 2 years ago	Make the animation api compile when QT_NO_THREAD is defined
	b739ad7 ck about 2 years ago	Assistant: Simplify check for SQLITE plugin.
	c74dead Leonardo Sobral Cunha about 2 years ago	add QModelIndex::rowCount() and QModelIndex::ColumnCount convenience methods
	0080d9f Carolina Gomes about 2 years ago	Solved bug reported at http://bugreports.qt.nokia.com/browse/QTBUG-5357 by modifying QGraphicsWidget::itemChange method, taking the burde...
	a226e30 Carolina Gomes about 2 years ago	Patch to QTBUG-914

Showing

Showing 8cb83f3-931ede8

Comments
Include comments entered inline

→ State changed from New to Merged

Looks good to me. I have merge your patch on oslo-¼.6, it should be visible in a few hours.

Benjamin Poulain | 2010-02-03 11:01:44 UTC

Add a new comment:

Login or create an account to post a comment

How to apply this merge request to your repository

One way to merge in these changes is to pull them into a local branch for review, verifying the changes and then merge to back to master.

# Check out a new branch for integration
git checkout -b merge-requests/441

# Fetch the merge request into this branch
git pull \
  git://gitorious.org/qt/qt.git \
  refs/merge-requests/441

# Show the commits, assess they are okay
git log --pretty=oneline --abbrev-commit master..merge-requests/441

# To apply the changes to your branch:
git checkout master
git merge merge-requests/441
git push origin master

Reviewing merge request #441: Cleared up QEvent documentation for QGraphicsSceneDragDropEvent events.

Commits that would be merged:

Comments Include comments entered inline

Add a new comment:

Gitorious

Comments
Include comments entered inline