Merge branch 'master-upstream'
authorThierry Bastian <thierry.bastian@nokia.com>
Tue, 19 Apr 2011 13:55:10 +0000 (15:55 +0200)
committerThierry Bastian <thierry.bastian@nokia.com>
Tue, 19 Apr 2011 13:55:10 +0000 (15:55 +0200)
commitf540574b44aa874af22ce8b15598b854f28517d7
tree6e7b375107fdfeee54516ebc0cd52837a32035eb
parent364ce5b7f5379499562b4f4f5a68da7ba068fe1e
parent8485052e3991aebf7c823b3e80fc06ccf9f08991
Merge branch 'master-upstream'
doc/src/frameworks-technologies/model-view-programming.qdoc
src/corelib/thread/qthread_win.cpp
src/gui/kernel/qapplication_win.cpp
src/gui/kernel/qwidget.cpp
src/gui/widgets/qmenu.cpp
tests/auto/gui.pro