Qt.git - Qt s a cross-platform application framework that is used for developing application software that can be run on various software and hardware platforms with little or no change in the underlying codebase, while still being a native application with native capabilities and speed.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master-upstream' into master-water	Thierry Bastian	2010-12-09	2	-13/+0
\|\
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-12-08	1	-1/+0
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Fix QApplication::setGraphicsSystem() since lighthouse integration
\| \| *	Fix QApplication::setGraphicsSystem() since lighthouse integration	Gunnar Sletta	2010-12-08	1	-1/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The application set parameter was overridden by this piece of ligthhouse legacy. Reviewed-by: Jørgen Lind
\| * \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-12-08	0	-0/+0
\| \|\ \ \| \| \|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Revert "QScroller merge, part 2" Revert "Fix code style issues in QScroller based Flickable replacement." Revert "Fix qreal vs. double issue and a copy/paste error." Fix qreal vs. double issue and a copy/paste error. Fix code style issues in QScroller based Flickable replacement. QScroller merge, part 2
\| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-12-07	0	-0/+0
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Revert "QScroller merge, part 2" Revert "Fix code style issues in QScroller based Flickable replacement." Revert "Fix qreal vs. double issue and a copy/paste error." Fix qreal vs. double issue and a copy/paste error. Fix code style issues in QScroller based Flickable replacement. QScroller merge, part 2
\| \| \| *	Revert "QScroller merge, part 2"	Robert Griebl	2010-12-07	10	-1530/+2426
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 53dd7206a7a2ba4393d558bf76fa23f4a4e05183. (Some weird autotest regressions have shown up - need to fix those first)
\| \| \| *	Revert "Fix code style issues in QScroller based Flickable replacement."	Robert Griebl	2010-12-07	2	-4/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 01276467bc7cf9b7cf8f83dc924a47b90e5bf053. (Some weird autotest regressions have shown up - need to fix those first)
\| \| \| *	Revert "Fix qreal vs. double issue and a copy/paste error."	Robert Griebl	2010-12-07	1	-14/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 236d4e3c5d58e69a85a362c702d830227309404d. (Some weird autotest regressions have shown up - need to fix those first)
\| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-12-07	10	-2427/+1530
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix qreal vs. double issue and a copy/paste error. Fix code style issues in QScroller based Flickable replacement. QScroller merge, part 2
\| \| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-12-06	10	-2427/+1530
\| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Fix qreal vs. double issue and a copy/paste error. Fix code style issues in QScroller based Flickable replacement. QScroller merge, part 2
\| \| \| \| \| *	Fix qreal vs. double issue and a copy/paste error.	Robert Griebl	2010-12-06	1	-13/+14
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Ralf Engels
\| \| \| \| \| *	Fix code style issues in QScroller based Flickable replacement.	Robert Griebl	2010-12-05	2	-6/+4
\| \| \| \| \| \|
\| \| \| \| \| *	QScroller merge, part 2	Robert Griebl	2010-12-03	10	-2426/+1530
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This merge consists of a QScroller based Flickable/Listview/Gridview replacement for QML. The complete history is in http://scm.dev.nokia.troll.no/projects/qt/repos/rgriebls-qt-flickgesture/logs/4.7-flickgesture (part 1 is the actual QScroller implementation / part 3 is QWebView support) Task-number: QTBUG-13390 Reviewed-by: Ralf Engels
\| * \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-12-08	1	-12/+0
\| \|\ \ \ \ \ \| \| \|/ / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Optimize behavior of QGLTextureCache
\| \| * \| \| \|	Optimize behavior of QGLTextureCache	Harald Fernengel	2010-12-07	1	-12/+0
\| \|/ / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	When we iterate over the cache to figure out which objects to remove, we would change the internal order of the cache, leading to a suboptimal caching behavior. Instead, let QCache decide which objects to remove when the cache overflows, based on its internal last-recently-used algorithm. Reviewed-by: Samuel Rødal
* \| \| \| \|	fix qFadeEffect windowOpacity issue on Windows	miniak	2010-12-08	1	-5/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 2519 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* \| \| \| \|	Cleanup unused QAccessWidget	miniak	2010-12-08	1	-17/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 2519 Reviewed-by: Thierry Bastian <thierry.bastian@nokia.com>
* \| \| \| \|	Merge branch 'master-upstream' into master-water	Thierry Bastian	2010-12-08	4	-3/+24
\|\ \ \ \ \ \| \|/ / / /
\| * \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-12-07	1	-0/+3
\| \|\ \ \ \ \| \| \|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Add library prefixes for Cygwin
\| \| * \| \|	Add library prefixes for Cygwin	İsmail Dönmez	2010-12-07	1	-0/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge-request: 2520 Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
\| * \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-12-06	3	-3/+21
\| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: Revert "QSystemTrayIcon::messageTimeout() signal implemented" print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
\| \| * \| \| \|	Revert "QSystemTrayIcon::messageTimeout() signal implemented"	Paul Olav Tvete	2010-12-06	5	-75/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 7a5b81532d482b611d5ea8b3a93e6ee9f9098db0. Reverted because the autotest fails. Reviewed-by: Gunnar
\| \| * \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-12-06	8	-4/+96
\| \| \|\ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
\| \| \| * \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-12-04	8	-4/+96
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
\| \| \| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-12-03	8	-4/+96
\| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
\| \| \| \| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-12-02	8	-4/+96
\| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
\| \| \| \| \| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-12-01	8	-4/+96
\| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
\| \| \| \| \| \| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-12-01	8	-4/+96
\| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
\| \| \| \| \| \| \| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-11-30	8	-4/+96
\| \| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
\| \| \| \| \| \| \| \| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-11-29	8	-4/+96
\| \| \| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: print out which GLSL shader that failed compilation for better debugging QSystemTrayIcon::messageTimeout() signal implemented --warn compile with debug defined enabled
\| \| \| \| \| \| \| \| \| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2	Gunnar Sletta	2010-11-29	340	-6284/+22458
\| \| \| \| \| \| \| \| \| \| \|\ \ \
\| \| \| \| \| \| \| \| \| \| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-11-28	5	-1/+75
\| \| \| \| \| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QSystemTrayIcon::messageTimeout() signal implemented
\| \| \| \| \| \| \| \| \| \| \| \| * \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-11-26	5	-1/+75
\| \| \| \| \| \| \| \| \| \| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QSystemTrayIcon::messageTimeout() signal implemented
\| \| \| \| \| \| \| \| \| \| \| \| \| * \| \|	QSystemTrayIcon::messageTimeout() signal implemented	miniak	2010-11-26	5	-1/+75
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-3870 Merge-request: 710 Reviewed-by: Olivier Goffart <olivier.goffart@nokia.com>
\| \| \| \| \| \| \| \| \| \| * \| \| \| \| \|	print out which GLSL shader that failed compilation for better debugging	Gunnar Sletta	2010-11-28	1	-2/+19
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| \| * \| \| \| \| \|	--warn	Gunnar Sletta	2010-11-24	1	-0/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| \| \| \| \| \| \| \| * \| \| \| \| \|	compile with debug defined enabled	Gunnar Sletta	2010-11-24	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master-upstream' into master-water	Thierry Bastian	2010-12-07	13	-68/+35
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-12-06	12	-63/+30
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| / / \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: QGtkStyle: Use gtk_progress_configure() instead of adjustment API Move test data to a qrc file.
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	QGtkStyle: Use gtk_progress_configure() instead of adjustment API	Andreas Kling	2010-12-06	3	-15/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There is no corresponding getter for gtk_progress_set_adjustment() anyway, so the old code was actually crashing. Reviewed-by: Jens Bache-Wiig
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Move test data to a qrc file.	Jedrzej Nowacki	2010-12-06	9	-48/+25
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Using qrc file simplify deployment on a device. Reviewed-by: Kent Hansen
\| * \| \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-12-06	1	-5/+5
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / / / \| \| \| / / / / / / / / / / / / \| \| \|/ / / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix license header.
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Fix license header.	Jason McDonald	2010-12-06	1	-5/+5
\| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Trust Me
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master-upstream' into master-water	Thierry Bastian	2010-12-05	39	-7/+7124
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / /
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-12-03	39	-7/+7124
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| / \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Make it compile on Mac OS X 10.5 Touch events do not work on Mac OS 10.5 Simple fixes for CI gate Fix compile on QWS Fix code style issues in QScroller QScroller merge, part 1
\| \| * \| \| \| \| \| \| \| \| \|	Make it compile on Mac OS X 10.5	Robert Griebl	2010-12-03	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Touch events do not work on Mac OS 10.5	Robert Griebl	2010-12-03	1	-2/+10
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-12-03	39	-7/+7116
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Simple fixes for CI gate Fix compile on QWS Fix code style issues in QScroller QScroller merge, part 1
\| \| * \| \| \| \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-12-02	39	-7/+7116
\| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Simple fixes for CI gate Fix compile on QWS Fix code style issues in QScroller QScroller merge, part 1
\| \| \| * \| \| \| \| \| \| \| \|	Simple fixes for CI gate	Robert Griebl	2010-12-02	4	-4/+44
\| \| \| \| \| \| \| \| \| \| \| \|