summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJarek Kobus <jkobus@trolltech.com>2010-06-22 10:25:57 (GMT)
committerJarek Kobus <jkobus@trolltech.com>2010-06-22 10:26:47 (GMT)
commit6f2720d42c215d411dcd165e3092d6a546ed1ed2 (patch)
tree9ad6ea5dce312cd793b19e0da33791924cb1ea3e /tools
parentf56ef9b4f7b4509cf14d1f38086f6801cd1b9df4 (diff)
downloadQt-6f2720d42c215d411dcd165e3092d6a546ed1ed2.zip
Qt-6f2720d42c215d411dcd165e3092d6a546ed1ed2.tar.gz
Qt-6f2720d42c215d411dcd165e3092d6a546ed1ed2.tar.bz2
Prohibit some property names to be used for dynamic properties
Since they are used internally for some legacy stuff. We prohibit "groupButtonId" and "database". Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com> Task-number: QTBUG-11584
Diffstat (limited to 'tools')
-rw-r--r--tools/designer/src/lib/shared/qdesigner_propertysheet.cpp4
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