Merge commit 'origin/0.9.1-beta'
commit238b81cc9fc69c9ab8d69d553fcb4acc957cc237
authorcon <qtc-committer@nokia.com>
Fri, 12 Dec 2008 10:09:05 +0000 (12 11:09 +0100)
committercon <qtc-committer@nokia.com>
Fri, 12 Dec 2008 10:09:05 +0000 (12 11:09 +0100)
tree91815fa95a47e2385501f36415a4188b5451a2a3
parent2bb0db7d82937ae14729ba034823fadf604e8553
parent0145a3dea966df75afbf5c85c824d37795ad645c
Merge commit 'origin/0.9.1-beta'
src/plugins/designer/workbenchintegration.cpp