Merge remote branch 'origin/4.6' into qt-4.7-from-4.6
authorThiago Macieira <thiago.macieira@nokia.com>
Thu, 27 May 2010 23:05:41 +0000 (01:05 +0200)
committerThiago Macieira <thiago.macieira@nokia.com>
Thu, 27 May 2010 23:06:01 +0000 (01:06 +0200)
commit85fa83ac89367bf4f3a85d038ef64a362aa8377e
tree706bc6aa64be436480d0d6a0c5603ff31186bfbb
parent103e1e8ea5e8879f2bb97e008840a212b3004a51
parent8f011df08139bea59c12ae0804969334a9374dc8
Merge remote branch 'origin/4.6' into qt-4.7-from-4.6

Conflicts:
demos/spectrum/app/engine.h
demos/spectrum/app/mainwidget.h
demos/spectrum/app/settingsdialog.h
demos/spectrum/app/spectrograph.h
demos/spectrum/app/spectrumanalyser.h
demos/spectrum/app/tonegenerator.h
demos/spectrum/app/tonegeneratordialog.h
demos/spectrum/app/utils.h
demos/spectrum/app/waveform.h
tests/auto/qtextcodec/tst_qtextcodec.cpp
demos/spectrum/app/engine.h
demos/spectrum/app/mainwidget.h
src/corelib/tools/qvarlengtharray.h
src/gui/egl/qegl.cpp
tests/auto/qprinter/tst_qprinter.cpp
tests/auto/qtextcodec/tst_qtextcodec.cpp
tests/auto/qvarlengtharray/tst_qvarlengtharray.cpp