Merge branch '4.6'
authorJason McDonald <jason.mcdonald@nokia.com>
Wed, 9 Sep 2009 04:48:46 +0000 (14:48 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Wed, 9 Sep 2009 04:48:46 +0000 (14:48 +1000)
commit1e6a4aab859ab1a41e9bcedb6e8f8f9dc8296d54
treee2f9bc8a8ca67f1bf0543605bab8ba7348539b1b
parent01f48343efd58df74a14e89eb5ead6be5d532c64
parentb2daad6cce4298ba438aba4b0e8bb3ea80680c6e
Merge branch '4.6'

Conflicts:
examples/assistant/simpletextviewer/findfiledialog.cpp
examples/assistant/simpletextviewer/findfiledialog.h
examples/assistant/simpletextviewer/main.cpp
examples/assistant/simpletextviewer/mainwindow.cpp
examples/assistant/simpletextviewer/mainwindow.h
tools/assistant/compat/config.cpp
tools/assistant/compat/config.h
tools/assistant/compat/docuparser.cpp
tools/assistant/compat/docuparser.h
tools/assistant/compat/fontsettingsdialog.cpp
tools/assistant/compat/fontsettingsdialog.h
tools/assistant/compat/helpdialog.cpp
tools/assistant/compat/helpdialog.h
tools/assistant/compat/helpdialog.ui
tools/assistant/compat/helpwindow.cpp
tools/assistant/compat/helpwindow.h
tools/assistant/compat/index.cpp
tools/assistant/compat/index.h
tools/assistant/compat/lib/qassistantclient.cpp
tools/assistant/compat/lib/qassistantclient.h
tools/assistant/compat/lib/qassistantclient_global.h
tools/assistant/compat/main.cpp
tools/assistant/compat/mainwindow.cpp
tools/assistant/compat/mainwindow.h
tools/assistant/compat/mainwindow.ui
tools/assistant/compat/profile.cpp
tools/assistant/compat/profile.h
tools/assistant/compat/tabbedbrowser.cpp
tools/assistant/compat/tabbedbrowser.h
tools/assistant/compat/tabbedbrowser.ui
tools/assistant/compat/topicchooser.cpp
tools/assistant/compat/topicchooser.h
tools/assistant/compat/topicchooser.ui
doc/src/deployment/deployment.qdoc
doc/src/getting-started/demos.qdoc
doc/src/index.qdoc
doc/src/modules.qdoc
doc/src/qt4-intro.qdoc
src/corelib/global/qglobal.h
src/corelib/io/qdatastream.h
tests/benchmarks/qgraphicsanchorlayout/tst_qgraphicsanchorlayout.cpp
tools/porting/src/q3porting.xml