diff options
| author | Martin Smith <martin.smith@nokia.com> | 2010-06-22 11:30:09 (GMT) |
|---|---|---|
| committer | Martin Smith <martin.smith@nokia.com> | 2010-06-22 11:30:09 (GMT) |
| commit | e39e53373754f45cf49eee5232598affec41b21c (patch) | |
| tree | 9d0d48ef1d14751fc30b2605d6e0f1d89d71a14c /tools | |
| parent | 255a1144166a1fa03c65fe3970dc77a5d081402c (diff) | |
| parent | 6f2720d42c215d411dcd165e3092d6a546ed1ed2 (diff) | |
| download | Qt-e39e53373754f45cf49eee5232598affec41b21c.zip Qt-e39e53373754f45cf49eee5232598affec41b21c.tar.gz Qt-e39e53373754f45cf49eee5232598affec41b21c.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/designer/src/lib/shared/qdesigner_propertysheet.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp index 08fedd2..086f46d 100644 --- a/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp +++ b/tools/designer/src/lib/shared/qdesigner_propertysheet.cpp @@ -693,6 +693,10 @@ bool QDesignerPropertySheet::dynamicPropertiesAllowed() const bool QDesignerPropertySheet::canAddDynamicProperty(const QString &propName) const { + // used internally + if (propName == QLatin1String("database") || + propName == QLatin1String("buttonGroupId")) + return false; const int index = d->m_meta->indexOfProperty(propName); if (index != -1) return false; // property already exists and is not a dynamic one |