path: root/src/widgets
diff options
Diffstat (limited to 'src/widgets')
2 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/doc/src/guibooks.qdoc b/src/widgets/doc/src/guibooks.qdoc
index 5f68344758..30ffd0b5ec 100644
--- a/src/widgets/doc/src/guibooks.qdoc
+++ b/src/widgets/doc/src/guibooks.qdoc
@@ -58,7 +58,7 @@
alphabetical dictionary of widgets and other user interface elements,
with comprehensive coverage of each. Each chapter covers one widget
or other element, contains the most important recommendation from the
- Macintosh, Windows and Motif style guides, notes about common
+ \macos, Windows and Motif style guides, notes about common
problems, comparison with other widgets that can serve some of the
same roles as this one, etc.
@@ -72,7 +72,7 @@
Human Interface Guidelines}}, Second Edition, ISBN
0-201-62216-5, is worth buying for the \e {don't}s alone. Even
- if you're not writing Macintosh software, avoiding most of what it
+ if you are not writing software for \macos, avoiding most of what it
advises against will produce more easily comprehensible software.
Doing what it tells you to do may also help.
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index 9583dd9657..f139fb2d5b 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -1818,7 +1818,7 @@ void QTreeView::drawBranches(QPainter *painter, const QRect &rect,
QStyle::State extraFlags = QStyle::State_None;
if (isEnabled())
extraFlags |= QStyle::State_Enabled;
- if (window()->isActiveWindow())
+ if (hasFocus())
extraFlags |= QStyle::State_Active;
QPoint oldBO = painter->brushOrigin();
if (verticalScrollMode() == QAbstractItemView::ScrollPerPixel)