gitorious.org Git - qt:qt.git/commit

author	Rohan McGovern <rohan.mcgovern@nokia.com>
	Tue, 17 May 2011 23:09:12 +0000 (09:09 +1000)
committer	Rohan McGovern <rohan.mcgovern@nokia.com>
	Tue, 17 May 2011 23:10:18 +0000 (09:10 +1000)
commit	bcec005dd1cb6eea2c2a43b681be9b56eb06fba7
tree	b426c3a515b2388c39059aa2cdc8fd409661787c	tree \| snapshot
parent	08a5b8d504e86a80488a2a13525e700b6f8b3311	commit \| diff
parent	5e38a334b1ef46a932c8aff65a7d448b5c7df853	commit \| diff

Merge remote branch 'origin/4.7' into 4.8-from-4.7

Conflicts:
src/corelib/io/qfsfileengine_iterator_unix.cpp
src/corelib/io/qfsfileengine_iterator_win.cpp
src/network/access/qnetworkaccessdatabackend.cpp
src/xmlpatterns/expr/qevaluationcache_p.h
tests/auto/declarative/qdeclarativewebview/tst_qdeclarativewebview.cpp
tools/assistant/tools/assistant/helpviewer_qwv.h
tools/qtconfig/mainwindowbase.cpp
tools/qtconfig/paletteeditoradvancedbase.cpp
tools/qtconfig/paletteeditoradvancedbase.ui
tools/qtconfig/previewwidgetbase.ui

1403 files changed:

.gitignore	diff1 \|	diff2 \|	blob \| history
bin/createpackage.pl	diff1 \|	diff2 \|	blob \| history
bin/elf2e32_qtwrapper.pl	diff1 \|	diff2 \|	blob \| history
bin/patch_capabilities.pl	diff1 \|	diff2 \|	blob \| history
config.tests/unix/opengles1/opengles1.cpp	diff1 \|	diff2 \|	blob \| history
config.tests/unix/opengles2/opengles2.cpp	diff1 \|	diff2 \|	blob \| history
config.tests/x11/opengl/opengl.cpp	diff1 \|	diff2 \|	blob \| history
configure	diff1 \|	diff2 \|	blob \| history
demos/affine/main.cpp	diff1 \|	diff2 \|	blob \| history
demos/boxes/glbuffers.cpp	diff1 \|	diff2 \|	blob \| history
demos/boxes/glbuffers.h	diff1 \|	diff2 \|	blob \| history
demos/boxes/qtbox.cpp	diff1 \|	diff2 \|	blob \| history
demos/boxes/scene.cpp	diff1 \|	diff2 \|	blob \| history
demos/browser/browserapplication.cpp	diff1 \|	diff2 \|	blob \| history
demos/browser/cookiejar.cpp	diff1 \|	diff2 \|	blob \| history
demos/browser/networkaccessmanager.cpp	diff1 \|	diff2 \|	blob \| history
demos/browser/networkaccessmanager.h	diff1 \|	diff2 \|	blob \| history
demos/browser/settings.cpp	diff1 \|	diff2 \|	blob \| history
demos/chip/view.cpp	diff1 \|	diff2 \|	blob \| history
demos/chip/view.h	diff1 \|	diff2 \|	blob \| history
demos/composition/main.cpp	diff1 \|	diff2 \|	blob \| history
demos/declarative/snake/content/Link.qml	diff1 \|	diff2 \|	blob \| history
demos/declarative/snake/snake.qml	diff1 \|	diff2 \|	blob \| history
demos/deform/main.cpp	diff1 \|	diff2 \|	blob \| history
demos/deform/pathdeform.cpp	diff1 \|	diff2 \|	blob \| history
demos/embeddeddialogs/customproxy.cpp	diff1 \|	diff2 \|	blob \| history
demos/gradients/main.cpp	diff1 \|	diff2 \|	blob \| history
demos/interview/model.cpp	diff1 \|	diff2 \|	blob \| history
demos/mainwindow/colorswatch.cpp	diff1 \|	diff2 \|	blob \| history
demos/mainwindow/toolbar.cpp	diff1 \|	diff2 \|	blob \| history
demos/pathstroke/main.cpp	diff1 \|	diff2 \|	blob \| history
demos/pathstroke/pathstroke.cpp	diff1 \|	diff2 \|	blob \| history
demos/shared/arthurstyle.cpp	diff1 \|	diff2 \|	blob \| history
demos/shared/arthurwidgets.cpp	diff1 \|	diff2 \|	blob \| history
demos/spreadsheet/spreadsheetitem.cpp	diff1 \|	diff2 \|	blob \| history
doc/src/declarative/basictypes.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/declarative/example-slideswitch.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/declarative/extending.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/declarative/modules.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/development/assistant-manual.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/development/qmake-manual.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/examples/customtype.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/frameworks-technologies/model-view-programming.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/getting-started/examples.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/legal/3rdparty.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/network-programming/qtnetwork.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/platforms/platform-notes-rtos.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/platforms/platform-notes.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/porting/porting4.qdoc	diff1 \|	diff2 \|	blob \| history
doc/src/xml-processing/xml-patterns.qdoc	diff1 \|	diff2 \|	blob \| history
mkspecs/common/posix/qplatformdefs.h	diff1 \|	diff2 \|	blob \| history
mkspecs/macx-g++/qplatformdefs.h	diff1 \|	diff2 \|	blob \| history
mkspecs/macx-g++40/qplatformdefs.h	diff1 \|	diff2 \|	blob \| history
mkspecs/macx-g++42/qplatformdefs.h	diff1 \|	diff2 \|	blob \| history
mkspecs/macx-icc/qplatformdefs.h	diff1 \|	diff2 \|	blob \| history
mkspecs/macx-llvm/qplatformdefs.h	diff1 \|	diff2 \|	blob \| history
mkspecs/macx-xcode/qplatformdefs.h	diff1 \|	diff2 \|	blob \| history
mkspecs/qws/linux-lsb-g++/qmake.conf	diff1 \|	diff2 \|	blob \| history
projects.pro	diff1 \|	diff2 \|	blob \| history
qmake/cachekeys.h	diff1 \|	diff2 \|	blob \| history
qmake/generators/mac/pbuilder_pbx.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/makefile.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/makefile.h	diff1 \|	diff2 \|	blob \| history
qmake/generators/metamakefile.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/symbian/initprojectdeploy_symbian.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/symbian/symbian_makefile.h	diff1 \|	diff2 \|	blob \| history
qmake/generators/symbian/symbiancommon.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/symbian/symmake.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/symbian/symmake_sbsv2.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/unix/unixmake.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/unix/unixmake.h	diff1 \|	diff2 \|	blob \| history
qmake/generators/unix/unixmake2.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/borland_bmake.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/mingw_make.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/msbuild_objectmodel.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/msbuild_objectmodel.h	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/msvc_nmake.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/msvc_nmake.h	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/msvc_objectmodel.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/msvc_objectmodel.h	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/msvc_vcproj.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/msvc_vcproj.h	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/msvc_vcxproj.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/msvc_vcxproj.h	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/winmakefile.cpp	diff1 \|	diff2 \|	blob \| history
qmake/generators/win32/winmakefile.h	diff1 \|	diff2 \|	blob \| history
qmake/main.cpp	diff1 \|	diff2 \|	blob \| history
qmake/option.cpp	diff1 \|	diff2 \|	blob \| history
qmake/option.h	diff1 \|	diff2 \|	blob \| history
qmake/project.cpp	diff1 \|	diff2 \|	blob \| history
qmake/property.cpp	diff1 \|	diff2 \|	blob \| history
qmake/property.h	diff1 \|	diff2 \|	blob \| history
src/corelib/animation/qabstractanimation.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/animation/qabstractanimation.h	diff1 \|	diff2 \|	blob \| history
src/corelib/animation/qabstractanimation_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/arch/qatomic_arch.h	diff1 \|	diff2 \|	blob \| history
src/corelib/arch/qatomic_arm.h	diff1 \|	diff2 \|	blob \| history
src/corelib/arch/qatomic_armv6.h	diff1 \|	diff2 \|	blob \| history
src/corelib/arch/symbian/qatomic_generic_armv6.cpp	diff1 \|	\|	blob \| history
src/corelib/arch/symbian/qt_hybridheap_symbian_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/codecs/qiconvcodec.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/codecs/qtextcodec.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qfuture.h	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qfuturewatcher.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qfuturewatcher.h	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qtconcurrentcompilertest.h	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qtconcurrentexception.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qtconcurrentfilter.h	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qtconcurrentfunctionwrappers.h	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qtconcurrentiteratekernel.h	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qtconcurrentmap.h	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qtconcurrentrunbase.h	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qthreadpool.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qthreadpool.h	diff1 \|	diff2 \|	blob \| history
src/corelib/concurrent/qthreadpool_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qendian.h	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qfeatures.h	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qglobal.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qglobal.h	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qlibraryinfo.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qnamespace.h	diff1 \|	diff2 \|	blob \| history
src/corelib/global/qnamespace.qdoc	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qabstractfileengine.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qabstractfileengine_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qdatastream.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qdatastream.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qdebug.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qdir.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qdir.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qdiriterator.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfile.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfile.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfile_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfileinfo.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfileinfo.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfileinfo_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfilesystemwatcher.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfilesystemwatcher_fsevents.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfilesystemwatcher_fsevents_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfilesystemwatcher_inotify.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfilesystemwatcher_kqueue.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfilesystemwatcher_kqueue_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfilesystemwatcher_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfilesystemwatcher_win.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfsfileengine.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfsfileengine.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfsfileengine_iterator.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfsfileengine_iterator_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfsfileengine_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfsfileengine_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qfsfileengine_win.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qiodevice.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qnoncontiguousbytedevice.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qnoncontiguousbytedevice_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qprocess.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qprocess.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qprocess_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qprocess_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qprocess_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qprocess_win.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qresource.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qsettings.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qsettings_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qtemporaryfile.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qtextstream.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qtextstream.h	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qurl.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/io/qurl.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qabstracteventdispatcher.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qabstractitemmodel.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qabstractitemmodel.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcore_mac_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcore_symbian_p.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcore_symbian_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcore_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcore_unix_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreapplication_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcoreevent.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qcrashhandler.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qeventdispatcher_glib.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qeventdispatcher_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qeventdispatcher_symbian_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qeventdispatcher_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qeventdispatcher_unix_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qeventdispatcher_win.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qeventloop.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qfunctions_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qfunctions_wince.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qmetaobject.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qmetaobject.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qmetaobject_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qmetatype.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qmetatype.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobject.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobject.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobject_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qobjectdefs.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qpointer.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qsharedmemory.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qsharedmemory.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qsharedmemory_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qsharedmemory_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qsharedmemory_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qsharedmemory_win.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qsystemsemaphore_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qtranslator.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qtranslator.h	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qvariant.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/kernel/qvariant.h	diff1 \|	diff2 \|	blob \| history
src/corelib/plugin/qfactoryloader.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/plugin/qlibrary.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/plugin/qlibrary_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/plugin/qlibrary_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/plugin/qplugin.h	diff1 \|	diff2 \|	blob \| history
src/corelib/plugin/qpluginloader.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/statemachine/qstatemachine.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qmutex.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qmutex.h	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qmutex_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qmutex_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qmutex_win.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qmutexpool.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qmutexpool_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qorderedmutexlocker_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qsemaphore.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qthread.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qthread_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qthread_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qthread_win.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qthreadstorage.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qthreadstorage.h	diff1 \|	diff2 \|	blob \| history
src/corelib/thread/qwaitcondition_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qbitarray.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qbitarray.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qbytearray.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qbytearray.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qcache.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qchar.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qchar.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qcontiguouscache.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qcontiguouscache.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qdatetime.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qdatetime_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qelapsedtimer.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qelapsedtimer.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qelapsedtimer_generic.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qelapsedtimer_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qelapsedtimer_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qelapsedtimer_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qelapsedtimer_win.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qhash.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qhash.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qlinkedlist.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qlinkedlist.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qlist.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qlist.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qlocale.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qlocale.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qlocale_data_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qlocale_p.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qlocale_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qmap.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qmap.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qpoint.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qpoint.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qqueue.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qqueue.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qregexp.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qregexp.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qscopedpointer.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qset.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qset.qdoc	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qshareddata.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qsharedpointer.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qsharedpointer.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qsharedpointer_impl.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qsimd.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstack.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstack.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstring.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstring.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstringbuilder.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstringbuilder.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstringlist.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qstringlist.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qvarlengtharray.h	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qvarlengtharray.qdoc	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qvector.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/tools/qvector.h	diff1 \|	diff2 \|	blob \| history
src/corelib/xml/qxmlstream.cpp	diff1 \|	diff2 \|	blob \| history
src/corelib/xml/qxmlstream.h	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbus_symbols_p.h	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusabstractinterface.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusargument.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusargument.h	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusargument_p.h	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusconnection.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusconnection.h	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusconnection_p.h	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusdemarshaller.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusintegrator.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusintegrator_p.h	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusinternalfilters.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusmarshaller.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusmessage.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusmessage_p.h	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusmetatype.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusmetatype_p.h	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusserver.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusserver.h	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusutil.cpp	diff1 \|	diff2 \|	blob \| history
src/dbus/qdbusutil_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebug.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebugserver.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebugserver_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebugserverconnection_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebugservice.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebugservice_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebugservice_p_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebugtrace.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qdeclarativedebugtrace_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qpacketprotocol.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/debugger/qpacketprotocol_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativeflickable.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativegridview.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativelistview.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativepincharea.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativepincharea_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativepincharea_p_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativetext.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativetextedit.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativetextinput.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativetextinput_p_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/graphicsitems/qdeclarativetextlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/parser/qdeclarativejsengine_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarative.h	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativecompiler.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativecustomparser.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativedirparser.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativedirparser_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeengine.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeengine_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeenginedebug.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeenginedebug_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeimport.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeobjectscriptclass.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeparser.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeproperty.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativescriptparser.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativesqldatabase.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativestringconverters.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativetypenamescriptclass.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativevaluetype.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativeworkerscript.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qdeclarativexmlhttprequest.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qmetaobjectbuilder.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qmetaobjectbuilder_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qperformancetimer.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/qml/qperformancetimer_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativeanimation.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativeanimation_p_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativeapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativeapplication_p.h	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativelistmodel.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativeview.cpp	diff1 \|	diff2 \|	blob \| history
src/declarative/util/qdeclarativexmllistmodel.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/accessible/qaccessible.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/accessible/qaccessible.h	diff1 \|	diff2 \|	blob \| history
src/gui/accessible/qaccessible_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/accessible/qaccessibleobject.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/accessible/qaccessiblewidget.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qcolordialog_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qdialog.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qfiledialog.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qfiledialog_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qfiledialog_win.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qfileinfogatherer.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qfileinfogatherer_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qfilesystemmodel.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qfilesystemmodel.h	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qfontdialog_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qinputdialog.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qinputdialog.h	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qmessagebox.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qnspanelproxy_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/dialogs/qpagesetupdialog_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/egl/qegl.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/egl/qegl_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/embedded/qkbd_defaultmap_qws_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/embedded/qkbd_qws.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/embedded/qkbddriverfactory_qws.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/embedded/qlock.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/embedded/qmousedriverfactory_qws.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/embedded/qscreen_qws.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/embedded/qscreen_qws.h	diff1 \|	diff2 \|	blob \| history
src/gui/embedded/qscreendriverfactory_qws.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/embedded/qwslock.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/embedded/qwssignalhandler.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsanchorlayout_p.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsgridlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsgridlayout.h	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsitem.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsitemanimation.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicslayout.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicslayout_p.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicslayout_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicslayoutitem.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicslayoutitem.h	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsproxywidget.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsscene.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsscene_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsscenebsptreeindex.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsview.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicsview_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgraphicswidget_p.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgridlayoutengine.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/graphicsview/qgridlayoutengine_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/image/qbitmap.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qbitmap.h	diff1 \|	diff2 \|	blob \| history
src/gui/image/qicon.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qicon.h	diff1 \|	diff2 \|	blob \| history
src/gui/image/qimage.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qimage.h	diff1 \|	diff2 \|	blob \| history
src/gui/image/qimage_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/image/qimagereader.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qmnghandler.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qmovie.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qnativeimage.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpaintengine_pic.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpicture.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpicture.h	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmap.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmap.h	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmap_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmap_raster.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmap_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmap_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmapdata_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpixmapdatafactory.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qpnghandler.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qtiffhandler.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qvolatileimagedata.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/image/qxpmhandler.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/inputmethod/qcoefepinputcontext_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/inputmethod/qcoefepinputcontext_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qabstractitemdelegate.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qabstractitemview.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qabstractitemview_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qabstractproxymodel.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qabstractproxymodel.h	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qfileiconprovider.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qheaderview.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qitemdelegate.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qitemselectionmodel.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qitemselectionmodel.h	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qlistview.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qlistview_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qsortfilterproxymodel.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qstringlistmodel.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qstyleditemdelegate.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qtableview.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qtableview.h	diff1 \|	diff2 \|	blob \| history
src/gui/itemviews/qtreeview.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication_qws.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication_win.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qapplication_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qclipboard.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qclipboard.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoaapplication_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoaapplication_mac_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoaapplicationdelegate_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoamenuloader_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoapanel_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoapanel_mac_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoasharedwindowmethods_mac_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoaview_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoaview_mac_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoawindow_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoawindow_mac_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcocoawindowdelegate_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcursor.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcursor_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcursor_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qcursor_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qdesktopwidget_win.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qdnd_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qdnd_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qevent.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qevent.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qevent_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qeventdispatcher_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qgesturemanager.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qguifunctions_wince.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qguiplatformplugin.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qkeymapper_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qkeymapper_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qkeysequence.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qkeysequence.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qlayoutitem.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qmacdefines_mac.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qpalette.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qsizepolicy.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qsizepolicy.qdoc	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qsoftkeymanager_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qt_cocoa_helpers_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qt_cocoa_helpers_mac_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qt_s60_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qtooltip.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_win.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwidget_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qwindowdefs.h	diff1 \|	diff2 \|	blob \| history
src/gui/kernel/qx11embed_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/math3d/qgenericmatrix.h	diff1 \|	diff2 \|	blob \| history
src/gui/math3d/qmatrix4x4.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/math3d/qmatrix4x4.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qbackingstore.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qbackingstore_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qbezier.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qblendfunctions.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qblendfunctions_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qbrush.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qbrush.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qcolor.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qcolor_p.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qdrawhelper.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qdrawhelper_neon.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qdrawhelper_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qdrawhelper_sse2.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qdrawingprimitive_sse2_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qgraphicssystem.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qgraphicssystem_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qgraphicssystem_runtime.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qgraphicssystem_runtime_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qgraphicssystemfactory.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qgrayraster.c	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qgrayraster_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qoutlinemapper.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qoutlinemapper_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintbuffer.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintdevice.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_alpha.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_mac_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_raster_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengine_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpaintengineex.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainter.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainter.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainter_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainterpath.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpainterpath.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpdf.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpen.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpen.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpolygon.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qpolygon.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qprintengine_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qprintengine_pdf.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qprinterinfo.cpp	diff1 \|	\|	blob \| history
src/gui/painting/qprinterinfo.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qprinterinfo_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qprinterinfo_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qprinterinfo_win.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qrasterizer.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qregion.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qregion.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qstroker.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qtextureglyphcache.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qtextureglyphcache_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qtransform.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface_raster.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface_raster_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface_s60_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/painting/qwindowsurface_x11_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/s60framework/qs60mainappui.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/s60framework/qs60mainappui.h	diff1 \|	diff2 \|	blob \| history
src/gui/s60framework/qs60maindocument.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qcleanlooksstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qcommonstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qgtkpainter.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qgtkstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qgtkstyle_p.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qgtkstyle_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qmacstyle_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qplastiquestyle.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qs60style.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qs60style_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qstylehelper_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qstylesheetstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qstylesheetstyle_default.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qstylesheetstyle_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qwindowscestyle.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qwindowsstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qwindowsvistastyle.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/styles/qwindowsxpstyle.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/symbian/qsymbianevent.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/symbian/qsymbianevent.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qcssparser.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qcssparser_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfont_win.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase_qws.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase_win.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontdatabase_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_ft.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_ft_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_qpf.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_qws.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_s60.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_win.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_win_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_x11.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengine_x11_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontengineglyphcache_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontmetrics.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qfontmetrics.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qpfutil.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qstatictext.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextcontrol.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextcursor.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextcursor.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextdocument.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextdocument.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextdocument_p.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextdocument_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextdocumentfragment.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextdocumentlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextdocumentlayout_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextengine.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextengine_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextengine_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextformat.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextformat.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtexthtmlparser.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtexthtmlparser_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextimagehandler.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextlayout.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextlist.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextobject.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextobject.h	diff1 \|	diff2 \|	blob \| history
src/gui/text/qtextodfwriter.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qzip.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/text/qzipwriter_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/util/qcompleter.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/util/qdesktopservices.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/util/qdesktopservices_mac.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/util/qsystemtrayicon_win.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/util/qundogroup.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/util/qundostack.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/util/qundostack.h	diff1 \|	diff2 \|	blob \| history
src/gui/util/qundostack_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qabstractbutton.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qabstractslider_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qcheckbox.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qcheckbox.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qcocoamenu_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qcombobox.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qcombobox.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qcombobox_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qdatetimeedit.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qdatetimeedit_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qdial.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qdialogbuttonbox.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qdockarealayout.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qdockwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qeffects.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qfocusframe.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qlabel.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qlinecontrol.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qlinecontrol_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qlineedit.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qlineedit.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qlineedit_p.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qlineedit_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmainwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmainwindowlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmainwindowlayout_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmainwindowlayout_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmdiarea.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmdiarea.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmdiarea_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmdisubwindow.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmenu.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmenu.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmenu_mac.mm	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmenu_p.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmenu_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmenu_wince.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qmenubar.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qplaintextedit.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qradiobutton.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qradiobutton.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qsizegrip.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qspinbox.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qsplashscreen.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qstackedwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qtabbar.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qtabwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qtabwidget.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qtextedit.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qtoolbarlayout.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qtoolbutton.cpp	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qvalidator.h	diff1 \|	diff2 \|	blob \| history
src/gui/widgets/qworkspace.cpp	diff1 \|	diff2 \|	blob \| history
src/multimedia/audio/qaudiodeviceinfo_mac_p.cpp	diff1 \|	diff2 \|	blob \| history
src/multimedia/video/qvideosurfaceformat.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qftp.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttpnetworkconnection.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttpnetworkconnection_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttpnetworkconnectionchannel.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttpnetworkconnectionchannel_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttpnetworkreply.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttpnetworkreply_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttpnetworkrequest.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qhttpnetworkrequest_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccessbackend.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccessbackend_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccesscachebackend.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccessfilebackend.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccessftpbackend.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccesshttpbackend.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccesshttpbackend_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccessmanager.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccessmanager.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkaccessmanager_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkcookie.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkdiskcache.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkdiskcache_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkreply.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkreply.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkreply_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkreplyfileimpl.cpp	diff1 \|	\|	blob \| history
src/network/access/qnetworkreplyimpl.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkreplyimpl_p.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkrequest.cpp	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkrequest.h	diff1 \|	diff2 \|	blob \| history
src/network/access/qnetworkrequest_p.h	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qbearerengine.cpp	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qbearerengine_p.h	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qbearerplugin.cpp	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qbearerplugin_p.h	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworkconfigmanager.cpp	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworkconfigmanager.h	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworkconfigmanager_p.cpp	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworkconfigmanager_p.h	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworkconfiguration.cpp	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworkconfiguration.h	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworkconfiguration_p.h	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworksession.cpp	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworksession.h	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qnetworksession_p.h	diff1 \|	diff2 \|	blob \| history
src/network/bearer/qsharednetworksession_p.h	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qhostinfo.cpp	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qhostinfo_p.h	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qhostinfo_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qhostinfo_win.cpp	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qnetworkinterface_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qnetworkproxy.cpp	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qnetworkproxy.h	diff1 \|	diff2 \|	blob \| history
src/network/kernel/qnetworkproxy_symbian.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qabstractsocket.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qabstractsocket.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qabstractsocket_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qabstractsocketengine.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qabstractsocketengine_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qhttpsocketengine.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qhttpsocketengine_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qlocalserver.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qlocalserver_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qlocalsocket.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qlocalsocket_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qlocalsocket_win.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qnativesocketengine.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qnativesocketengine_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qnativesocketengine_unix.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qnativesocketengine_win.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qsocks5socketengine.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qsocks5socketengine_p.h	diff1 \|	diff2 \|	blob \| history
src/network/socket/qtcpserver.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qudpsocket.cpp	diff1 \|	diff2 \|	blob \| history
src/network/socket/qudpsocket.h	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qssl.cpp	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qssl.h	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslconfiguration.cpp	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslconfiguration.h	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslconfiguration_p.h	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslerror.cpp	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslerror.h	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslsocket.cpp	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslsocket.h	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslsocket_openssl.cpp	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslsocket_openssl_p.h	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslsocket_openssl_symbols.cpp	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslsocket_openssl_symbols_p.h	diff1 \|	diff2 \|	blob \| history
src/network/ssl/qsslsocket_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qglengineshadermanager.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qglengineshadermanager_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qglengineshadersource_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qglgradientcache.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qglgradientcache_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qpaintengineex_opengl2.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qtextureglyphcache_gl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl_egl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl_win.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qgl_x11egl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qglextensions_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qglframebufferobject.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qglframebufferobject.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qglframebufferobject_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qglpaintdevice.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qglpaintdevice_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qglpixelbuffer.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qglpixelbuffer_p.h	diff1 \|	diff2 \|	blob \| history
src/opengl/qglpixmapfilter.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qglshaderprogram.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qpaintengine_opengl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qpixmapdata_gl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qpixmapdata_poolgl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qwindowsurface_gl.cpp	diff1 \|	diff2 \|	blob \| history
src/opengl/qwindowsurface_gl_p.h	diff1 \|	diff2 \|	blob \| history
src/openvg/qpaintengine_vg.cpp	diff1 \|	diff2 \|	blob \| history
src/openvg/qpixmapdata_vg.cpp	diff1 \|	diff2 \|	blob \| history
src/openvg/qwindowsurface_vg.cpp	diff1 \|	diff2 \|	blob \| history
src/openvg/qwindowsurface_vg_p.h	diff1 \|	diff2 \|	blob \| history
src/plugins/accessible/widgets/complexwidgets.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/accessible/widgets/qaccessiblewidgets.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/accessible/widgets/rangecontrols.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/accessible/widgets/simplewidgets.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/connman/qconnmanservice_linux.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/connman/qofonoservice_linux.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/connman/qofonoservice_linux_p.h	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/corewlan/qcorewlanengine.mm	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/platformdefs_win.h	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/qbearerengine_impl.h	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/qnetworksession_impl.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/qnetworksession_impl.h	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/symbian/qnetworksession_impl.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/bearer/symbian/qnetworksession_impl.h	diff1 \|	diff2 \|	blob \| history
src/plugins/codecs/kr/qeuckrcodec.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwswsegl.c	diff1 \|	diff2 \|	blob \| history
src/plugins/graphicssystems/meego/qmeegographicssystem.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/graphicssystems/trace/qgraphicssystem_trace.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/platforms/cocoa/qcocoaintegration.h	diff1 \|	\|	blob \| history
src/plugins/platforms/wayland/gl_integration/xcomposite_glx/qwaylandxcompositeglxintegration.h	diff1 \|	\|	blob \| history
src/plugins/qmltooling/declarativeobserver/qdeclarativeobserverplugin.cpp	diff1 \|	\|	blob \| history
src/plugins/qmltooling/qmldbg_ost/qmlostplugin.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/qmltooling/qmldbg_ost/qmlostplugin.h	diff1 \|	diff2 \|	blob \| history
src/plugins/qmltooling/qmldbg_ost/qostdevice.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/qmltooling/qmldbg_ost/qostdevice.h	diff1 \|	diff2 \|	blob \| history
src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.cpp	diff1 \|	diff2 \|	blob \| history
src/plugins/qmltooling/qmldbg_tcp/qtcpserverconnection.h	diff1 \|	diff2 \|	blob \| history
src/plugins/s60/src/qlocale_3_2.cpp	diff1 \|	diff2 \|	blob \| history
src/qt3support/text/q3richtext.cpp	diff1 \|	diff2 \|	blob \| history
src/qt3support/text/q3textstream.h	diff1 \|	diff2 \|	blob \| history
src/qt3support/tools/q3cstring.h	diff1 \|	diff2 \|	blob \| history
src/qt3support/tools/q3valuevector.h	diff1 \|	diff2 \|	blob \| history
src/s60main/newallocator_hook.cpp	diff1 \|	diff2 \|	blob \| history
src/scripttools/debugging/qscriptdebuggercommand.cpp	diff1 \|	diff2 \|	blob \| history
src/scripttools/debugging/qscriptdebuggercommandexecutor.cpp	diff1 \|	diff2 \|	blob \| history
src/scripttools/debugging/qscriptdebuggerconsole.cpp	diff1 \|	diff2 \|	blob \| history
src/scripttools/debugging/qscriptdebuggerconsolewidget.cpp	diff1 \|	diff2 \|	blob \| history
src/scripttools/debugging/qscriptdebuggerevent.cpp	diff1 \|	diff2 \|	blob \| history
src/scripttools/debugging/qscriptdebuggerresponse.cpp	diff1 \|	diff2 \|	blob \| history
src/scripttools/debugging/qscriptdebuggerscriptedconsolecommand.cpp	diff1 \|	diff2 \|	blob \| history
src/scripttools/debugging/qscriptdebugoutputwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/scripttools/debugging/qscripterrorlogwidget.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/drivers/mysql/qsql_mysql.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/drivers/oci/qsql_oci.cpp	diff1 \|	diff2 \|	blob \| history
src/sql/drivers/odbc/qsql_odbc.cpp	diff1 \|	diff2 \|