Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorOlivier Goffart <olivier.goffart@nokia.com>
Mon, 17 May 2010 18:00:03 +0000 (20:00 +0200)
committerOlivier Goffart <olivier.goffart@nokia.com>
Mon, 17 May 2010 18:00:03 +0000 (20:00 +0200)
commit91a1f7a1c408052b1d284d6b901819964e338fe5
treedf7103f0ea0cb9d98f4b641d72c0f8b0ebdf2498
parent94a3356d5eb7b255d439efe2699bf3a9b025e8eb
parent509ef11ab4ba6165c16d9d311c4a1bf7cdfd2528
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
demos/demos.pro
mkspecs/features/resources.prf
mkspecs/features/uic.prf
src/corelib/io/qurl.cpp
src/corelib/tools/qlocale_symbian.cpp
src/gui/graphicsview/qgraphicsscene.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/util/qsystemtrayicon_win.cpp
src/multimedia/audio/qaudioinput.cpp
tests/auto/qhostinfo/qhostinfo.pro
55 files changed:
.gitignore
demos/demos.pro
demos/embedded/fluidlauncher/fluidlauncher.pro
mkspecs/features/moc.prf
projects.pro
qmake/generators/makefile.cpp
src/corelib/io/qurl.cpp
src/corelib/kernel/qeventdispatcher_symbian.cpp
src/corelib/tools/qlocale_symbian.cpp
src/dbus/qdbusmacros.h
src/gui/dialogs/qprintdialog_unix.cpp
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/graphicsview/qgraphicswidget.cpp
src/gui/graphicsview/qgraphicswidget_p.cpp
src/gui/graphicsview/qgraphicswidget_p.h
src/gui/itemviews/qabstractitemview.cpp
src/gui/kernel/qapplication_s60.cpp
src/gui/kernel/qapplication_win.cpp
src/gui/painting/qpainter.cpp
src/gui/painting/qpdf.cpp
src/gui/styles/qs60style_s60.cpp
src/gui/text/qfont.cpp
src/gui/text/qfontdatabase_s60.cpp
src/gui/util/qsystemtrayicon_win.cpp
src/gui/util/qsystemtrayicon_wince.cpp
src/gui/util/util.pri
src/gui/widgets/qcombobox.cpp
src/gui/widgets/qmenu.h
src/gui/widgets/qmenu_p.h
src/gui/widgets/qmenubar.cpp
src/multimedia/multimedia/audio/qaudio_symbian_p.cpp
src/multimedia/multimedia/audio/qaudio_symbian_p.h
src/multimedia/multimedia/audio/qaudiodeviceinfo_symbian_p.cpp
src/multimedia/multimedia/audio/qaudiodeviceinfo_symbian_p.h
src/multimedia/multimedia/audio/qaudioinput_symbian_p.cpp
src/multimedia/multimedia/audio/qaudioinput_symbian_p.h
src/multimedia/multimedia/audio/qaudiooutput.cpp
src/multimedia/multimedia/audio/qaudiooutput_symbian_p.cpp
src/multimedia/multimedia/audio/qaudiooutput_symbian_p.h
src/network/access/qhttpnetworkconnection.cpp
src/network/access/qhttpnetworkconnectionchannel.cpp
src/network/access/qnetworkaccessbackend.cpp
src/network/kernel/qhostinfo.cpp
src/network/kernel/qhostinfo_unix.cpp
src/opengl/gl2paintengineex/qglengineshadermanager.cpp
src/opengl/gl2paintengineex/qglengineshadersource_p.h
src/opengl/qpaintengine_opengl.cpp
src/openvg/qpaintengine_vg.cpp
tests/auto/qgraphicswidget/tst_qgraphicswidget.cpp
tests/auto/qhostinfo/qhostinfo.pro
tests/auto/qnetworkreply/tst_qnetworkreply.cpp
tests/auto/qurl/tst_qurl.cpp
tests/auto/xmlpatterns.pro
translations/translations.pri
translations/translations.pro