Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
authorJason McDonald <jason.mcdonald@nokia.com>
Wed, 6 Jan 2010 14:22:21 +0000 (00:22 +1000)
committerJason McDonald <jason.mcdonald@nokia.com>
Wed, 6 Jan 2010 14:22:21 +0000 (00:22 +1000)
commita24d87f6469fa491624590383617b43c2b3dda32
treeee6a76cecf35e3f20951f5b13785aaaef12bbade
parentda19e7f6b6b822f7a473c4eb2dff001a3434353a
parent2f8e66b326c3d6748d530ab5abbf4fe5a91a6a3f
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6
14 files changed:
doc/src/deployment/deployment.qdoc
doc/src/getting-started/installation.qdoc
doc/src/platforms/symbian-introduction.qdoc
doc/src/snippets/code/doc_src_deployment.qdoc
doc/src/snippets/code/doc_src_installation.qdoc
qmake/generators/symbian/symmake.cpp
src/gui/statemachine/qguistatemachine.cpp
src/gui/styles/qstyleoption.cpp
tools/assistant/tools/assistant/centralwidget.cpp
tools/runonphone/main.cpp
tools/runonphone/trk/launcher.cpp
tools/runonphone/trk/launcher.h
tools/runonphone/trksignalhandler.cpp
tools/runonphone/trksignalhandler.h