summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-09 15:23:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-09 15:23:03 (GMT)
commit68229f50480f4b3768e64cdba4d5ca0cc9534aa7 (patch)
tree52c4a2dba12e89123c577d9ea1c4cab84c2049f0
parent6a75b8d5463a6e4bda728a877caf3f06da50dd38 (diff)
parentcff4ff892778c6665f0283eb4bc5adf30f32c9b3 (diff)
downloadQt-68229f50480f4b3768e64cdba4d5ca0cc9534aa7.zip
Qt-68229f50480f4b3768e64cdba4d5ca0cc9534aa7.tar.gz
Qt-68229f50480f4b3768e64cdba4d5ca0cc9534aa7.tar.bz2
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Fix warning about uninitialised variable use
-rw-r--r--tools/designer/src/components/taskmenu/button_taskmenu.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/designer/src/components/taskmenu/button_taskmenu.cpp b/tools/designer/src/components/taskmenu/button_taskmenu.cpp
index b0b7d4a..953996b 100644
--- a/tools/designer/src/components/taskmenu/button_taskmenu.cpp
+++ b/tools/designer/src/components/taskmenu/button_taskmenu.cpp
@@ -528,7 +528,7 @@ bool ButtonTaskMenu::refreshAssignMenu(const QDesignerFormWindowInterface *fw, i
QList<QAction*> ButtonTaskMenu::taskActions() const
{
ButtonTaskMenu *ncThis = const_cast<ButtonTaskMenu*>(this);
- QButtonGroup *buttonGroup;
+ QButtonGroup *buttonGroup = 0;
QDesignerFormWindowInterface *fw = formWindow();
const SelectionType st = selectionType(fw->cursor(), &buttonGroup);