From 73a62a79f17c71b0af3bd94db9da45be689b347b Mon Sep 17 00:00:00 2001 From: Jan-Arve Saether Date: Tue, 5 Jul 2011 10:39:35 +0200 Subject: Make this feature public for Qt 4.8 (was privately added for Qt 4.7) --- src/gui/graphicsview/qgraphicslayout.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp index 6fbe849..d01c3af 100644 --- a/src/gui/graphicsview/qgraphicslayout.cpp +++ b/src/gui/graphicsview/qgraphicslayout.cpp @@ -466,7 +466,6 @@ void QGraphicsLayout::addChildLayoutItem(QGraphicsLayoutItem *layoutItem) static bool g_instantInvalidatePropagation = false; /*! - \internal \since 4.8 \sa instantInvalidatePropagation() @@ -496,7 +495,6 @@ void QGraphicsLayout::setInstantInvalidatePropagation(bool enable) } /*! - \internal \since 4.8 \sa setInstantInvalidatePropagation() -- cgit v0.12 From 56d49960bb99b7a4c18fc106fcca4effaeea8782 Mon Sep 17 00:00:00 2001 From: Jan-Arve Saether Date: Tue, 5 Jul 2011 14:04:28 +0200 Subject: My changes for 4.8.0 --- dist/changes-4.8.0 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dist/changes-4.8.0 b/dist/changes-4.8.0 index ae6d2c5..2f5858b 100644 --- a/dist/changes-4.8.0 +++ b/dist/changes-4.8.0 @@ -62,6 +62,7 @@ QtGui - QTabBar: reduced minimumSizeHint if ElideMode is set. - QComboBox: Fixed a color propagation issue with the lineedit. [QTBUG-5950] + - QGraphicsLayout: Made setInstantInvalidatePropagation() public - Deprecate qGenericMatrixFromMatrix4x4 and qGenericMatrixToMatrix4x4 - QListView diverses optimisations [QTBUG-11438] - QTreeWidget/QListWidget: use localeAwareCompare for string comparisons [QTBUG-10839] @@ -76,6 +77,8 @@ QtGui - Accessibility: Make QTabWidget child hierarchy consistent. - Accessibility: Report correct window title and application name. - Accessibility: Return text attributes for QTextEdit. + - Accessibility: Make accessibility work on Windows with alien widgets + - Accessibility: Several enablers for accessible graphicsview and Qt Quick applications. QtNetwork -- cgit v0.12 From 9ef422955154199e6f2d5569cb4074a5967f53e9 Mon Sep 17 00:00:00 2001 From: Gabriel de Dietrich Date: Tue, 5 Jul 2011 14:06:43 +0200 Subject: Lion Support: Fix QSpinBox look Also sets the read-only state in QStyleOptionSpinBox, wich wasn't before. Reviewed-by: Jens Bache-Wiig --- src/gui/styles/qmacstyle_mac.mm | 2 +- src/gui/widgets/qabstractspinbox.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index efe2e7d..321db25 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -4725,7 +4725,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex HIThemeFrameDrawInfo fdi; fdi.version = qt_mac_hitheme_version; - fdi.state = tds; + fdi.state = ((sb->state & State_ReadOnly) || !(sb->state & State_Enabled)) ? kThemeStateInactive : kThemeStateActive; fdi.kind = kHIThemeFrameTextFieldSquare; fdi.isFocused = false; HIRect hirect = qt_hirectForQRect(lineeditRect); diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp index 4372ae3..7a985a1 100644 --- a/src/gui/widgets/qabstractspinbox.cpp +++ b/src/gui/widgets/qabstractspinbox.cpp @@ -1655,6 +1655,8 @@ void QAbstractSpinBox::initStyleOption(QStyleOptionSpinBox *option) const : (QAbstractSpinBox::StepDownEnabled|QAbstractSpinBox::StepUpEnabled); option->frame = d->frame; + if (d->readOnly) + option->state |= QStyle::State_ReadOnly; } /*! -- cgit v0.12