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
*	Update def files for latest QtDeclarative APIv4.7.0-tp1	Shane Kearns	2010-03-10	2	-0/+120
\| \| \| \| \| \| \| \| \| \|	The QDeclarativeBinding API is new since last week's freeze. Froze the def files again, so that applications that use this API will be able to link. Task-number: QTBUG-8909 Reviewed-by: Trust Me (cherry picked from commit c0eeb2af8f6a023ac1c67f3cf955be3e4b13f998)
*	Create 4.7 def files for Symbian	Shane Kearns	2010-03-10	14	-8/+8899
\| \| \| \| \| \| \| \|	New QtDeclarative module New APIs in existing modules Reviewed-by: Trust Me (cherry picked from commit bd1325b892be6c8a57044268fd7b6a66a01e4bf7)
*	Introduces a crash on start-up regression for several apps (designer, etc) ↵	Jesper Thomschutz	2010-03-09	3	-262/+13
\| \| \| \| \| \| \| \|	on MinGW. Reverted for the alpha. Revert "Implement the blend functions with SSE2" This reverts commit f25099f400e7379f0a6e00500e990948b9785e63.
*	Revert "Replace the inline blend function by #define"	Jesper Thomschutz	2010-03-09	1	-60/+67
\| \| \| \|	This reverts commit c1fe9ae25aebc8d1b9c4a7f3e67fa25ecdcbadc8.
*	Fix visibility of classes in private headers upon which Bauhaus/Creator relies.	Warwick Allison	2010-03-05	2	-3/+3
\| \| \| \| \|	Author: Erik Verbruggen (cherry picked from commit b67d5d90a306534a1ea2fcb333981c6b1126105c)
*	Don't return QDeclarativeDeclarativeData for a deleting object	Aaron Kennedy	2010-03-05	2	-2/+6
\| \| \| \| \|	This was causing crashes in the qmldesigner. (cherry picked from commit 3b8cad8be96d7791e8ca8305609d1155ec093b80)
*	Add config.test for multimedia/qml	Jørgen Lind	2010-03-05	1	-9/+11
\| \| \| \| \| \| \|	using pkg-config from pri file is not good for cross-compiling Reviewed-by: paul (cherry picked from commit 9957e85e37345e946ecc67196d65fbca867a2001)
*	QDeclarativeView: Make usable in Designer	Friedemann Kleint	2010-03-05	1	-1/+3
\| \| \| \| \| \| \|	Make source a designable property, add missing declarations for enumerations. Reviewed-by: akennedy <qt-info@nokia.com> (cherry picked from commit 0998fc069512d0ae2853929489b80f35e0d9d4ae)
*	typo for windows ce exclusion rule	Maurice Kalinowski	2010-03-02	1	-1/+1
\| \| \| \| \|	Reviewed-by: Paul Olav Tvete (cherry picked from commit a7196feb11d701dd486e66fd06cbc50d84c9b1bb)
*	compile fix for WinCE	Maurice Kalinowski	2010-03-02	1	-0/+2
\| \| \| \| \| \| \|	do not include headers of disabled modules Reviewed-by: Paul Olav Tvete (cherry picked from commit 4795583b42577259499b34da07077f501e45ce42)
*	compile fix for WinCE	Maurice Kalinowski	2010-03-02	1	-1/+2
\| \| \| \| \| \| \|	need to add the win32 file to get copy and friends included Reviewed-by: Simon Hausmann (cherry picked from commit 57686d28fed85c9f8fbb340cd05f3fb6322332f7)
*	Added static method isValidColor to QColor.	Erik Verbruggen	2010-03-02	2	-3/+28
\| \| \| \| \|	Reviewed-by: Gunnar Sletta (cherry picked from commit 72da039e54a62bf3a481fefc753e0e50ba75df57)
*	Don't use SSE2 if the emmintrin.h header wasn't found.	Thiago Macieira	2010-02-28	1	-1/+1
\| \| \| \| \| \|	If you build on Solaris, the header isn't available, but SSE2 instructions are available on x86-64. So either we use inline assembly, or we disable the new code.
*	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-02-27	42	-168/+456
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
\| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-02-27	42	-168/+456
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
\| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-02-27	42	-168/+456
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
\| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-02-26	42	-168/+456
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
\| \| \| \| *	Merge branch 'master' of git:qt/qt-multimedia-staging into qml	Thiago Macieira	2010-02-26	42	-168/+456
\| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe
\| \| \| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-02-26	42	-168/+456
\| \| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
\| \| \| \| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging ↵	Qt Continuous Integration System	2010-02-25	42	-168/+456
\| \| \| \| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: Rebuild configure.exe Make the Direct Show media service compile with a Qt namespace. Make the Direct Show media service compile with mingw. QT7; Fix warnings. Qt namespace fixes. Fixed QTMoview object leak. QMediaContent: Add a convenience method to retrieve the QNetworkRequest. Use the monitor color space for video output. Test for the existance of the Windows Media SDK in configure. Try to start media playback on all load state changes. Remove all uses of __uuidof from the Direct Show media service. QT7; Add support for setting cookies when loading a movie.
\| \| \| \| \| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging	Andrew den Exter	2010-02-25	27	-71/+221
\| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| *	QT7; Fix warnings.	Justin McPherson	2010-02-25	1	-31/+43
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Dmytro Poplavskiy
\| \| \| \| \| \| \| \| *	Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multimedia-staging	Justin McPherson	2010-02-25	7	-34/+86
\| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| *	Fixed QTMoview object leak.	Dmytro Poplavskiy	2010-02-25	2	-2/+4
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Justin McPherson
\| \| \| \| \| \| \| \| \| *	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging	Dmytro Poplavskiy	2010-02-25	2	-0/+10
\| \| \| \| \| \| \| \| \| \|\
\| \| \| \| \| \| \| \| \| \| *	QMediaContent: Add a convenience method to retrieve the QNetworkRequest.	Justin McPherson	2010-02-25	2	-0/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Andrew den Exter
\| \| \| \| \| \| \| \| \| * \|	Use the monitor color space for video output.	Dmytro Poplavskiy	2010-02-25	2	-4/+34
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Currently the main monitor color space is used. Colorspace correction is disabled by default for renderer video output, since video frames can on any output device, not only on the main monitor. Reviewed-by: Justin McPherson
\| \| \| \| \| \| \| \| \| * \|	Try to start media playback on all load state changes.	Dmytro Poplavskiy	2010-02-25	2	-30/+40
\| \| \| \| \| \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QuickTime doesn't start movie playback as soon as it loaded, it's necessary to start manualy after suitable load state reached. Reviewed-by: Justin McPherson
\| \| \| \| \| \| \| \| * \|	Qt namespace fixes.	Justin McPherson	2010-02-25	19	-6/+92
\| \| \| \| \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Dmytro Poplavskiy
\| \| \| \| \| \| \| * \|	Make the Direct Show media service compile with a Qt namespace.	Andrew den Exter	2010-02-25	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Move a QFile include outside the namespace. Reviewed-by: Justin McPherson
\| \| \| \| \| \| \| * \|	Make the Direct Show media service compile with mingw.	Andrew den Exter	2010-02-25	10	-45/+152
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	There a number of interfaces and guid constants used by the media service that aren't defined by mingw. Define these locally. Reviewed-by: Justin McPherson
\| \| \| \| \| \| \| * \|	Test for the existance of the Windows Media SDK in configure.	Andrew den Exter	2010-02-25	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Some filters use interfaces from the windows media sdk instead of those from direct show. These interfaces aren't required for playback, but can provide better feedback about the current media than would otherwise be available. Reviewed-by: Justin McPherson
\| \| \| \| \| \| \| * \|	Remove all uses of __uuidof from the Direct Show media service.	Andrew den Exter	2010-02-25	10	-51/+59
\| \| \| \| \| \| \| \|/ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	It's unnecessary and not supported on all compilers. Reviewed-by: Justin McPherson
\| \| \| \| \| \| \| *	QT7; Add support for setting cookies when loading a movie.	Justin McPherson	2010-02-25	1	-4/+27
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Dmytro Poplavskiy
* \| \| \| \| \| \| \|	Merge remote branch 'origin/master' into 4.7	Thiago Macieira	2010-02-27	420	-22087/+25245
\|\ \ \ \ \ \ \ \ \| \|/ / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/corelib/kernel/qmetatype.cpp src/declarative/graphicsitems/qdeclarativeevents.cpp src/declarative/graphicsitems/qdeclarativeflickable.cpp src/declarative/graphicsitems/qdeclarativegridview.cpp src/declarative/qml/qdeclarativescript.cpp src/declarative/util/qdeclarativeanimation.cpp src/declarative/util/qdeclarativebehavior.cpp src/declarative/util/qdeclarativeeasefollow.cpp src/declarative/util/qdeclarativefontloader.cpp src/declarative/util/qdeclarativelistmodel.cpp src/declarative/util/qdeclarativespringfollow.cpp src/declarative/util/qdeclarativestategroup.cpp src/declarative/util/qdeclarativesystempalette.cpp src/declarative/util/qdeclarativetimer.cpp src/declarative/util/qmlstateoperations.cpp src/multimedia/qml/qdeclarativeaudio.cpp src/multimedia/qml/qdeclarativevideo.cpp
\| * \| \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-02-27	3	-4/+285
\| \|\ \ \ \ \ \ \ \| \| \|/ / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMainWindow would show hidden QDockwidget when calling rstoreDockWidget Compile on WinCE
\| \| * \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into ↵	Qt Continuous Integration System	2010-02-27	3	-4/+285
\| \| \|\ \ \ \ \ \ \| \| \| \|/ / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: QMainWindow would show hidden QDockwidget when calling rstoreDockWidget Compile on WinCE
\| \| \| * \| \| \| \|	QMainWindow would show hidden QDockwidget when calling rstoreDockWidget	Thierry Bastian	2010-02-26	1	-2/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-7785 Reviewed-by: ogoffart
\| \| \| * \| \| \| \|	Compile on WinCE	aavit	2010-02-25	2	-2/+284
\| \| \| \| \|_\|/ / \| \| \| \|/\| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵	Qt Continuous Integration System	2010-02-26	10	-22/+44
\| \|\ \ \ \ \ \ \| \| \|/ / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: (22 commits) fix "configure -fast" on Windows for other maketools than nmake Get qmake to add pdb files to install target in debug configuration. add TARGET_PLATFORM to qmakespecs with MAKEFILE_GENERATOR = UNIX give symbian an own platform mode deprecate -win32/-unix/-macx which set both host and target mode decouple host platform mode from target platform mode factor out applyHostMode() make QMAKE_QMAKE and QMAKE_EXT_OBJ magic builtins use QDir::separator() instead of Option::dir_sep where appropriate simplify string ops sanitize evaluation of OS scopes instead of hard-coding recursion for symbian, add it to the specs add possibility to request project recursion from within a pro file fix ts-assistant target use QList::reserve() as appropriate optimize appending of (empty) lists to (empty) lists suppress pointer aliasing warnings Fix compilation with namespace. Assistant: Make ~AbstractHelpViewer() virtual. Prepare German translations for 4.7 (except Quick). ...
\| \| * \| \| \| \|	Merge remote branch 'origin/master' into berlin-master	Joerg Bornemann	2010-02-26	449	-22277/+25381
\| \| \|\ \ \ \ \ \| \| \| \| \|/ / / \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure.exe
\| \| * \| \| \| \|	use QList::reserve() as appropriate	Oswald Buddenhagen	2010-02-25	2	-0/+6
\| \| \| \| \| \| \|
\| \| * \| \| \| \|	optimize appending of (empty) lists to (empty) lists	Oswald Buddenhagen	2010-02-25	1	-9/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	if appending an empty lists, don't do anything. if appending to an empty list, just assign. this saves some needless detaches/reallocs. Reviewed-by: joao
\| \| * \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into ↵	Qt Continuous Integration System	2010-02-24	8	-13/+22
\| \| \|\ \ \ \ \ \| \| \| \|_\|_\|_\|/ \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1: suppress pointer aliasing warnings Fix compilation with namespace. Assistant: Make ~AbstractHelpViewer() virtual. Prepare German translations for 4.7 (except Quick). tr()-Fixes in Assistant/QHelpLib code. Remove QObject::tr() in the network module code.
\| \| \| * \| \| \|	suppress pointer aliasing warnings	Oswald Buddenhagen	2010-02-24	1	-3/+6
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the code as such is safe, as no aliasing can occur here. so it is just a matter of making the compiler shut up. Reviewed-by: Olivier Goffart
\| \| \| * \| \| \|	Fix compilation with namespace.	ck	2010-02-24	1	-0/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Remove QObject::tr() in the network module code.	Friedemann Kleint	2010-02-24	6	-10/+15
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-02-26	50	-627/+1004
\| \|\ \ \ \ \ \ \| \| \|_\|_\|/ / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	master-integration * 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public: (81 commits) Added addMMPRules for adding conditional MMP_RULES Allow overriding TARGET.EPOCHEAPSIZE with MMP_RULES Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f. Fix for cetest. Speed up compilation of this test with MSVC. New benchmark for QDirIterator Backporting auto-test utility header from master. Fix a signed/unsigned comparison compiler warning Removed an export that shouldn't be exported. Reduced the code and memory footprint of the keymap. Enabled Qt key events to work also when native key code is missing. Cleaning of the patch to QTBUG-3168 Patch to QTBUG-3168 Crash in QGraphicsScenePrivate::setFocusItemHelper Pass the right arguments to QApplication in GraphicsView benchmark. Improvements to itemview keypad navigation in S60. Revert changes made in scroll_sys(). Fix SymbianMakefileGenerator::absolutizePath for clean builds Set the roleNames of proxy models to the roleNames of the source model. Add benchmarks for accessing meta-object properties via QScriptValue ...
\| \| * \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60	axis	2010-02-26	50	-627/+1004
\| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.h
\| \| \| * \| \| \| \|	Build break fix for commit d8465414e6fd543cfc20e732030dedd8d2bc685f.	Janne Anttila	2010-02-26	2	-4/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RVCT does not like static inline, and variables should not be defined in case statement without braces. In this case the temp variable was actually unnecessary. Reviewed-By: TrustMe