diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-24 21:16:41 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-06-24 21:16:41 (GMT) |
| commit | fd5c6436d4be5ce6db57a8a34951c8ab4dac9000 (patch) | |
| tree | 2b2ce0df9cd0bfcc1c8a0566668c92df8be94206 /tools/designer/src/components | |
| parent | 117b9bb3d576d9974b3d05174d1fccf98e47cb22 (diff) | |
| parent | 5f5cf5b798cc7e65e47987b654beaf9d762406eb (diff) | |
| download | Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.zip Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.gz Qt-fd5c6436d4be5ce6db57a8a34951c8ab4dac9000.tar.bz2 | |
Merge branch '4.5'
Conflicts:
tests/auto/qsqldatabase/tst_databases.h
Diffstat (limited to 'tools/designer/src/components')
| -rw-r--r-- | tools/designer/src/components/signalsloteditor/signalslot_utils.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp b/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp index 37269c5..c268d5f 100644 --- a/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp +++ b/tools/designer/src/components/signalsloteditor/signalslot_utils.cpp @@ -275,7 +275,7 @@ namespace qdesigner_internal { const QDesignerMemberSheet *memberSheet = qobject_cast<QDesignerMemberSheet*>(core->extensionManager()->extension(object, Q_TYPEID(QDesignerMemberSheetExtension))); - return memberSheet->isQt3Signal(i); + return (memberSheet && memberSheet->isQt3Signal(i)); } } @@ -294,7 +294,7 @@ namespace qdesigner_internal { const QDesignerMemberSheet *memberSheet = qobject_cast<QDesignerMemberSheet*>(core->extensionManager()->extension(object, Q_TYPEID(QDesignerMemberSheetExtension))); - return memberSheet->isQt3Slot(i); + return (memberSheet && memberSheet->isQt3Slot(i)); } } return false; |