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 '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-19	7	-5/+19
\|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (203 commits) Fix compilation of OpenVG. Fixed wrong qmake logic for Symbian. Fixed a bug where a proxy widget received FocusIn over and over. Fixed broken test. Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles. Fix dependency so it works also on massive parrallel systems Set PM_MenuScrollerHeight to zero Change QS60Style to use combobox popup menu This should likely get webkit linking again on windows/sbsv2 Handle Symbian's file name encoding, correctly. Fix linking issues of QtOpenVG.dll Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Make sure target path exists in qmake_extra_pre_targetdep.flm Added close button to Anomaly demo browser ...
\| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-18	7	-5/+19
\| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (201 commits) Fixed a bug where a proxy widget received FocusIn over and over. Fixed broken test. Fixed recursive QMAKE_EXTRA_TARGETS for symbian makefiles. Fix dependency so it works also on massive parrallel systems Set PM_MenuScrollerHeight to zero Change QS60Style to use combobox popup menu This should likely get webkit linking again on windows/sbsv2 Handle Symbian's file name encoding, correctly. Fix linking issues of QtOpenVG.dll Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Make sure target path exists in qmake_extra_pre_targetdep.flm Added close button to Anomaly demo browser Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. ...
\| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-17	7	-5/+19
\| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: (190 commits) Fixed Symbian applications with DESTDIR set. Removed a warning about generated rss files. Revert "Temporarily disable problematic dll." Fixed "Cannot install protected application" message on Symbian. Worked around a crash in the elf2e32 postlinker tool. Worked around case differences in Symbian^3 and Gnupoc. Enabled compilation of plugins again. Fixed a building bug where the DLL entry point was undefined. Moved UID2 processing from cpp code to profiles. Added rpp and rsg files to ignore filter. Moved two profiles to the correct directory. Fix build break caused by undefined symbol SetDialogPreference Temporarily disable problematic dll. Use the same concept for per-lib tweaks as armcc Consistently use the * in configure Symbian doesn't have large file support currently, just turn it off Remove largefile config test Make sure that we have all compile flags available always Enabled dependencies for .dso and .lib libraries only. Switched to using DEF_FILE, which is the official variable. ...
\| \| \| *	Worked around case differences in Symbian^3 and Gnupoc.	axis	2010-03-16	2	-2/+12
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	RevBy: Miikka Heikkinen
\| \| \| *	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7-s60	axis	2010-03-16	25	-2748/+216
\| \| \| \|\ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: demos/embedded/anomaly/anomaly.pro demos/embedded/flightinfo/flightinfo.pro demos/embedded/lightmaps/lightmaps.pro demos/embedded/weatherinfo/weatherinfo.pro examples/network/fortuneclient/fortuneclient.pro examples/network/fortuneserver/fortuneserver.pro examples/network/network-chat/network-chat.pro mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/platform_paths.prf qmake/generators/symbian/symmake.cpp qmake/generators/symbian/symmake.h src/s60installs/s60installs.pro
\| \| \| * \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-03-15	5	-23/+36
\| \| \| \|\ \
\| \| \| * \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-03-11	82	-1754/+1651
\| \| \| \|\ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.h qmake/project.cpp src/3rdparty/webkit/WebCore/WebCore.pro src/src.pro
\| \| \| * \| \| \|	Made header inclusion Linux friendly.	axis	2010-03-01	1	-1/+1
\| \| \| \| \| \| \|
\| \| \| * \| \| \|	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-03-01	77	-146/+12447
\| \| \| \|\ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure mkspecs/common/symbian/symbian.conf qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake_abld.cpp qmake/generators/symbian/symmake_sbsv2.cpp src/plugins/plugins.pro
\| \| \| * \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-02-23	123	-11/+21382
\| \| \| \|\ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/features/symbian/qt.prf qmake/Makefile.unix qmake/Makefile.win32 qmake/Makefile.win32-g++ qmake/Makefile.win32-g++-sh qmake/generators/symbian/initprojectdeploy_symbian.cpp src/src.pro
\| \| \| * \ \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	axis	2010-02-19	1	-7/+4
\| \| \| \|\ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	merge-with-qt-master Conflicts: qmake/generators/symbian/symmake.cpp
\| \| \| * \ \ \ \ \ \	Merge branch 'master' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-02-16	5	-513/+79
\| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: configure mkspecs/common/symbian/symbian.conf mkspecs/features/symbian/application_icon.prf qmake/generators/makefile.cpp qmake/generators/symbian/initprojectdeploy_symbian.cpp qmake/generators/symbian/symmake.cpp tools/assistant/tools/assistant/assistant.pro
\| \| \| \| * \ \ \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into master-s60	axis	2010-02-16	1	-0/+11
\| \| \| \| \|\ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: qmake/generators/symbian/symmake.cpp tests/auto/qlineedit/tst_qlineedit.cpp tests/benchmarks/benchmarks.pro
\| \| \| * \| \| \| \| \| \| \| \|	Fixed position of plugins on Symbian.	axis	2010-02-12	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt	axis	2010-02-12	8	-19/+370
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \|/ / / / / / / \| \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/common/symbian/symbian.conf qmake/generators/makefile.cpp qmake/generators/symbian/symmake.cpp src/3rdparty/webkit/WebCore/WebCore.pro Conflict resolution was heavily based on manual application of commit 9cc4ae77a73bd28ff495f36f26dd87c78b76b976.
\| \| \| * \| \| \| \| \| \| \| \|	Disable sqlite plugin compilation on symbian by default	Thomas Zander	2010-02-08	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \|
\| \| \| * \| \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-01-26	1	-3/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/common/symbian/symbian.conf src/gui/kernel/qapplication_s60.cpp
\| \| \| * \ \ \ \ \ \ \ \ \	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public	axis	2010-01-21	137	-384/+406
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: mkspecs/features/symbian/platform_paths.prf
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Fix symbian building to always have a pre-determined uid3	Thomas Zander	2010-01-19	3	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	For all Qt libs we use hardcoded uid3s, so these plugins should have them too.
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Fixed Symbian detection in profile.	axis	2010-01-12	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Replace AspectRatioMode enum from QVideoWidget with Qt::AspectRatioMode.	Andrew den Exter	2010-03-18	10	-39/+39
\|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-9118 Reviewed-by: Dmytro Poplavskiy
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt into 4.7	Kai Koehne	2010-03-17	17	-236/+794
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	I submitted the same updated configure.exe to both qt.git and qt-multimedia-staging.git. Furthermore, there were other updates to configure.exe in qt.git. Seems git cannot resolve this on it's own. Conflicts: configure.exe
\| * \| \| \| \| \| \| \| \| \| \| \|	probably need to update user configurations once in a while too	Lorn Potter	2010-03-17	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	use dynamicstore instead	Lorn Potter	2010-03-17	1	-29/+14
\| \| \| \| \| \| \| \| \| \| \| \| \|
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-03-15	17	-236/+809
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (72 commits) different approach to fixing "the other" aliasing issue fix aliasing issue in node_construct() detach in fewer cases, remove redundant calculation SSL: Fix memleak related to local certificate Improve keyboard layout detection on X11 Compile on ARM with -Werror -Wold-style-cast Use the vista-style native dialog for QFileDialog::getExistingDirectory Apply the stdset attribute for resource properties doc: Completed sentence about HideNameFilterDetails Doc fix in QLocale Doc for for QGestureRecognizer::create. Fix broken setCollectionFile (creating multiple models instead reusing) Enable the fast paths when converting to Rgb565 qdoc: ifdefed out all the debug code. Add missing QtScript API shims Further fix license whitespace. Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. ...
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-03-15	17	-236/+809
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (61 commits) Fix broken setCollectionFile (creating multiple models instead reusing) Enable the fast paths when converting to Rgb565 qdoc: ifdefed out all the debug code. Add missing QtScript API shims Further fix license whitespace. Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. Fix up whitespace in license headers. Fix SetDialogPreference build error on Symbian. get known wifi networks a more complicated way, but without accessing Only enable BM by default in QNAM for appropriate platforms. fix crash on 10.6 with no wifi interface Fix creation of QNetworkSession. Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe. remove qt_winQString2MB() and qt_winMB2QString() Fix include() path in qimportbase.pri Fix qmake crash on Windows Compile ...
\| \| \| * \ \ \ \ \ \ \ \ \ \	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-03-15	17	-236/+809
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|_\|_\|/ \| \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (56 commits) Remove NetworkManager test-bed application. Remove configure test for NetworkManager. Fix QDir::entryList regression Add DEFINES to mingw32/windres.exe command line. Fix up whitespace in license headers. Fix SetDialogPreference build error on Symbian. get known wifi networks a more complicated way, but without accessing Only enable BM by default in QNAM for appropriate platforms. fix crash on 10.6 with no wifi interface Fix creation of QNetworkSession. Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe. remove qt_winQString2MB() and qt_winMB2QString() Fix include() path in qimportbase.pri Fix qmake crash on Windows Compile Revert some unfinished changes. Fix compilation with namespaced Qt Add a placeholder text into the new search lineedit Ui improvements to QDBusViewer. Make double-clicking a d-bus method work again ...
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Remove configure test for NetworkManager.	Aaron McCarthy	2010-03-15	1	-1/+1
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The NetworkManager plugin for Brearer Management no longer has a compile time dependency on NetworkManager. Task-number: QTBUG-9005
\| \| \| \| * \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-03-12	16	-235/+808
\| \| \| \| \|\ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: (50 commits) get known wifi networks a more complicated way, but without accessing Only enable BM by default in QNAM for appropriate platforms. fix crash on 10.6 with no wifi interface Fix creation of QNetworkSession. Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe. remove qt_winQString2MB() and qt_winMB2QString() Fix include() path in qimportbase.pri Fix qmake crash on Windows Compile Revert some unfinished changes. Fix compilation with namespaced Qt Add a placeholder text into the new search lineedit Ui improvements to QDBusViewer. Make double-clicking a d-bus method work again Changed Qdbusviewer to match D-Bus type signature in addition to method name when finding a method. qdoc: Added debug code. Update separate regions instead of their bounding box. doc: Fixed three new qdoc errors. Autotest: make the qabstractslider test pass on mac Compile ...
\| \| \| \| \| * \| \| \| \| \| \| \| \| \|	get known wifi networks a more complicated way, but without accessing	Lorn Potter	2010-03-12	2	-102/+265
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	the keychain. Users will still see the keychain prompt when attempting to connect/associate with a wifi network.
\| \| \| \| \| * \| \| \| \| \| \| \| \| \|	fix crash on 10.6 with no wifi interface	Lorn Potter	2010-03-12	2	-5/+16
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-8954
\| \| \| \| \| * \| \| \| \| \| \| \| \| \|	Make QNetworkConfigurationManager and QNetworkConfiguration threadsafe.	Aaron McCarthy	2010-03-11	16	-134/+533
\| \| \| \| \| \| \|_\|_\|_\|_\|_\|_\|_\|/ \| \| \| \| \| \|/\| \| \| \| \| \| \| \|
* \| \| \| \| \| \| \| \| \| \| \| \| \|	Pause the direct show graph when the playback rate is 0.0.	Andrew den Exter	2010-03-17	2	-16/+47
\|/ / / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Justin McPherson
* \| \| \| \| \| \| \| \| \| \| \| \|	Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration ↵	Qt Continuous Integration System	2010-03-15	23	-2730/+30
\|\ \ \ \ \ \ \ \ \ \ \ \ \ \| \|/ / / / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	into 4.7-integration * 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (65 commits) QSslKey: Do not make OpenSSL prompt for a password on stdin Typo fix in qtestlib Moved Symbian audio backend into QtMultimedia.dll Updated Symbian DEF files Updated qt.iby Fixed filename cases to support building Qt for Symbian in Linux Moved softkey "Options" action handling from QMainWindow to QMenuBar. HotFix for fluidlauncher default size caused by 6d44dadd. Removed compiler warning from qdesktopwidget_s60.cpp. Ensure that the entire CLOB can be returned from an Oracle database QAudioInput sometimes not writing to QIODevice isalpha() is unspecified for values outside uchar and EOF Fixed bug in QTransform::type() after using operator/ or operator*. Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 ) Doc: Removed lie that access to QBuffer is unbuffered. Minisplitter doesn't paint to the bottom/right Support for adding user specified list type content in rss file Fixed RSS_RULES statement in application_icon.prf Avoid unnecessary memory allocation in the jpeg handler's image detection QVarLenghtArray: Call constructor when resizing the array for Movable types. ...
\| * \| \| \| \| \| \| \| \| \| \| \|	Merge remote branch 'origin/4.6' into qt-4.7-from-4.6	Thiago Macieira	2010-03-15	23	-2730/+30
\| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \|/ / / / / / / / / / / \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: src/gui/styles/qs60style_s60.cpp
\| \| * \| \| \| \| \| \| \| \| \| \|	Moved Symbian audio backend into QtMultimedia.dll	Gareth Stockwell	2010-03-12	12	-2707/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Changed backend from being a plugin, to being statically compiled into QtMultimedia.dll. This is to achieve consistency with the backends for other plugins, and to allow the plugin API to be modified. Task-number: QTBUG-8994 Reviewed-by: trustme
\| \| * \| \| \| \| \| \| \| \| \| \|	Fixed filename cases to support building Qt for Symbian in Linux	Miikka Heikkinen	2010-03-12	3	-3/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Part of QtP delta reduction effort. Task-number: QT-3055 Reviewed-by: Janne Koskinen
\| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into ↵	Qt Continuous Integration System	2010-03-11	1	-1/+5
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( 266a6c4f1938dd9edf4a8125faf91c62495e3ce2 ) Doc: Removed lie that access to QBuffer is unbuffered. Minisplitter doesn't paint to the bottom/right Avoid unnecessary memory allocation in the jpeg handler's image detection
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Avoid unnecessary memory allocation in the jpeg handler's image detection	Simon Hausmann	2010-03-11	1	-1/+5
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The handler calls peek with 2 bytes to inspect the first two bytes. Instead of calling the overload of peek() that returns a new QByteArray with just two bytes, allocate 2 bytes on the stack and call the overload of peek() that writes into the specified buffer. Reviewed-by: Joao
\| \| * \| \| \| \| \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-10	1	-0/+0
\| \| \|\ \ \ \ \ \ \ \ \ \ \ \ \| \| \| \|/ / / / / / / / / / / \| \| \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed dialog resize not to move the dialog for Symbian. Fix SDP files are not supported. Fix build break caused by undefined symbol SetDialogPreference Renamed test benchmark targets. Added check for null pointer in qt_vg_unregister_pixmap. Add '.' dir as the first include directory in Symbian Enabled some examples by default in Symbian builds Added forwarding headers for qplatformdefs.h in Symbian mkspecs QUnixPrintWidget should not be declared in Symbian Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location. Export qtdemoapps.iby to proper location Added some missing IBY export paths to platform_path.prf
\| \| \| * \| \| \| \| \| \| \| \| \| \|	Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public into ↵	Qt Continuous Integration System	2010-03-10	1	-0/+0
\| \| \| \|\ \ \ \ \ \ \ \ \ \ \ \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.6-integration * '4.6' of scm.dev.nokia.troll.no:qt/qt-s60-public: Fixed dialog resize not to move the dialog for Symbian. Fix SDP files are not supported. Fix build break caused by undefined symbol SetDialogPreference Renamed test benchmark targets. Added check for null pointer in qt_vg_unregister_pixmap. Add '.' dir as the first include directory in Symbian Enabled some examples by default in Symbian builds Added forwarding headers for qplatformdefs.h in Symbian mkspecs QUnixPrintWidget should not be declared in Symbian Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location. Export qtdemoapps.iby to proper location Added some missing IBY export paths to platform_path.prf
\| \| \| \| * \| \| \| \| \| \| \| \| \| \|	Fix sqlite3_v9.2.zip to export sqlite3.iby to correct location.	Miikka Heikkinen	2010-03-10	1	-0/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	sqlite3.iby needs to be exported under epoc32/rom/include/core/mw, instead of epoc32/rom/include. Part of QtP delta reduction effort Reviewed-by: TrustMe
\| \| * \| \| \| \| \| \| \| \| \| \| \| \|	Do qFatal() on unsupported screen format instead of crashing later	Paul Olav Tvete	2010-03-10	1	-0/+3
\| \| \|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: Related to QTBUG-5117 Reviewed-by: Jørgen Lind
\| \| * \| \| \| \| \| \| \| \| \| \| \|	compile fix for plugins\sqldrivers\sqlite on WinCE 6	Joerg Bornemann	2010-03-10	1	-0/+2
\| \| \|/ / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Don't use localtime_s. Reviewed-by: thartman
\| \| * \| \| \| \| \| \| \| \| \| \|	Compile without QT3_SUPPORT	Anders Bakken	2010-03-09	1	-2/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	QList<T>::remove() is QT3_SUPPORT, replace with erase(). Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
\| \| * \| \| \| \| \| \| \| \| \| \|	Improve scrolling in DirectFB	Anders Bakken	2010-03-09	2	-17/+13
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Since DirectFB always uses the front buffer of a double buffered surface as the source when blitting we needed to make sure that the front buffer was valid and hence we called Flip for each scroll. This had negative performance impacts since you could end up with various parts of a window being updated at different times. With this patch we store whether the front-buffer is up to date inside the window surface and only call Flip in scroll if it's not. Reviewed-by: Jervey Kong <jervey.kong@nokia.com>
\| \| * \| \| \| \| \| \| \| \| \| \|	Don't use DirectFB for non-existing pixmaps	Anders Bakken	2010-03-08	1	-0/+2
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	DirectFB will print a warning for this since the file doesn't exist but we might as well not try when we know the file doesn't exist. Reviewed-by: Donald Carr <donald.carr@nokia.com>
* \| \| \| \| \| \| \| \| \| \| \| \|	Gstreamer player: allow video output changes during video playback.	Dmytro Poplavskiy	2010-03-15	2	-18/+186
\|/ / / / / / / / / / / / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Reviewed-by: Andrew den Exter
* \| \| \| \| \| \| \| \| \| \| \|	Install plugins to correct path.	Justin McPherson	2010-03-15	3	-3/+3
\| \|/ / / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Task-number: QTBUG-9001 Reviewed-by: Kurt Korbatits
* \| \| \| \| \| \| \| \| \| \|	Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into ↵	Qt Continuous Integration System	2010-03-12	2	-20/+33
\|\ \ \ \ \ \ \ \ \ \ \ \| \|_\|/ / / / / / / / / \|/\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	4.7-integration * '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QPainterVideoSurface: assume yuv 420p and YV12 lines are 4 byte aligned. Delayed initialization of gstreamer video widget.