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 | |
| 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
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-open.c | 7 | ||||
| -rw-r--r-- | tools/designer/src/lib/shared/qdesigner_propertysheet.cpp | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-open.c b/src/3rdparty/harfbuzz/src/harfbuzz-open.c index 15cd2c1..f12f5b7 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-open.c +++ b/src/3rdparty/harfbuzz/src/harfbuzz-open.c @@ -1403,12 +1403,11 @@ _HB_OPEN_Get_Device( HB_Device* d, HB_UShort size, HB_Short* value ) { - HB_UShort byte, bits, mask, f, s; + HB_UShort byte, bits, mask, s; - f = d->DeltaFormat; - - if ( d->DeltaValue && size >= d->StartSize && size <= d->EndSize ) + if ( d && d->DeltaValue && size >= d->StartSize && size <= d->EndSize ) { + HB_UShort f = d->DeltaFormat; s = size - d->StartSize; byte = d->DeltaValue[s >> ( 4 - f )]; bits = byte >> ( 16 - ( ( s % ( 1 << ( 4 - f ) ) + 1 ) << f ) ); 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 |