From 6c492dac4d6e946fc8457b511d37e9d3b3008cc9 Mon Sep 17 00:00:00 2001
From: con <qtc-committer@nokia.com>
Date: Fri, 16 Apr 2010 11:39:36 +0200
Subject: [PATCH] Remove some focus rects on the Mac that don't belong there.
---
src/plugins/debugger/breakwindow.cpp | 1 +
src/plugins/debugger/moduleswindow.cpp | 1 +
src/plugins/debugger/registerwindow.cpp | 1 +
src/plugins/debugger/snapshotwindow.cpp | 2 +-
src/plugins/debugger/sourcefileswindow.cpp | 1 +
src/plugins/debugger/stackwindow.cpp | 1 +
src/plugins/debugger/threadswindow.cpp | 1 +
src/plugins/debugger/watchwindow.cpp | 1 +
src/plugins/qmlinspector/components/objectpropertiesview.cpp | 1 +
src/plugins/qmlinspector/components/objecttree.cpp | 1 +
src/plugins/qmlinspector/components/watchtable.cpp | 1 +
11 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/breakwindow.cpp b/src/plugins/debugger/breakwindow.cpp
index ca93a9c0a27..34ddcd551d5 100644
--- a/src/plugins/debugger/breakwindow.cpp
+++ b/src/plugins/debugger/breakwindow.cpp
@@ -85,6 +85,7 @@ BreakWindow::BreakWindow(Debugger::DebuggerManager *manager)
{
QAction *act = theDebuggerAction(UseAlternatingRowColors);
setFrameStyle(QFrame::NoFrame);
+ setAttribute(Qt::WA_MacShowFocusRect, false);
setWindowTitle(tr("Breakpoints"));
setWindowIcon(QIcon(":/debugger/images/debugger_breakpoints.png"));
setAlternatingRowColors(act->isChecked());
diff --git a/src/plugins/debugger/moduleswindow.cpp b/src/plugins/debugger/moduleswindow.cpp
index 0eb63d9f964..4144f82563f 100644
--- a/src/plugins/debugger/moduleswindow.cpp
+++ b/src/plugins/debugger/moduleswindow.cpp
@@ -64,6 +64,7 @@ ModulesWindow::ModulesWindow(DebuggerManager *debuggerManager,
{
QAction *act = theDebuggerAction(UseAlternatingRowColors);
setWindowTitle(tr("Modules"));
+ setAttribute(Qt::WA_MacShowFocusRect, false);
setSortingEnabled(true);
setAlternatingRowColors(act->isChecked());
setRootIsDecorated(false);
diff --git a/src/plugins/debugger/registerwindow.cpp b/src/plugins/debugger/registerwindow.cpp
index 537df775e8e..04146aea6b0 100644
--- a/src/plugins/debugger/registerwindow.cpp
+++ b/src/plugins/debugger/registerwindow.cpp
@@ -149,6 +149,7 @@ RegisterWindow::RegisterWindow(DebuggerManager *manager)
{
QAction *act = theDebuggerAction(UseAlternatingRowColors);
setWindowTitle(tr("Registers"));
+ setAttribute(Qt::WA_MacShowFocusRect, false);
setAlternatingRowColors(act->isChecked());
setRootIsDecorated(false);
setItemDelegate(new RegisterDelegate(m_manager, this));
diff --git a/src/plugins/debugger/snapshotwindow.cpp b/src/plugins/debugger/snapshotwindow.cpp
index 7cb1463d162..24d8a662555 100644
--- a/src/plugins/debugger/snapshotwindow.cpp
+++ b/src/plugins/debugger/snapshotwindow.cpp
@@ -74,7 +74,7 @@ SnapshotWindow::SnapshotWindow(DebuggerManager *manager, QWidget *parent)
QAction *act = theDebuggerAction(UseAlternatingRowColors);
setWindowTitle(tr("Snapshots"));
-
+ setAttribute(Qt::WA_MacShowFocusRect, false);
setFrameStyle(QFrame::NoFrame);
setAlternatingRowColors(act->isChecked());
setRootIsDecorated(false);
diff --git a/src/plugins/debugger/sourcefileswindow.cpp b/src/plugins/debugger/sourcefileswindow.cpp
index 448bfefffb8..e78cf93b363 100644
--- a/src/plugins/debugger/sourcefileswindow.cpp
+++ b/src/plugins/debugger/sourcefileswindow.cpp
@@ -171,6 +171,7 @@ SourceFilesWindow::SourceFilesWindow(QWidget *parent)
proxyModel->setSourceModel(m_model);
setModel(proxyModel);
+ setAttribute(Qt::WA_MacShowFocusRect, false);
setFrameStyle(QFrame::NoFrame);
setWindowTitle(tr("Source Files"));
setSortingEnabled(true);
diff --git a/src/plugins/debugger/stackwindow.cpp b/src/plugins/debugger/stackwindow.cpp
index 871e467995c..74f37ad5069 100644
--- a/src/plugins/debugger/stackwindow.cpp
+++ b/src/plugins/debugger/stackwindow.cpp
@@ -56,6 +56,7 @@ namespace Internal {
StackWindow::StackWindow(DebuggerManager *manager, QWidget *parent)
: QTreeView(parent), m_manager(manager), m_alwaysResizeColumnsToContents(false)
{
+ setAttribute(Qt::WA_MacShowFocusRect, false);
setFrameStyle(QFrame::NoFrame);
m_disassemblerAgent = new DisassemblerViewAgent(manager);
diff --git a/src/plugins/debugger/threadswindow.cpp b/src/plugins/debugger/threadswindow.cpp
index 6f5d4bbff3e..2c2dae34fb8 100644
--- a/src/plugins/debugger/threadswindow.cpp
+++ b/src/plugins/debugger/threadswindow.cpp
@@ -45,6 +45,7 @@ ThreadsWindow::ThreadsWindow(QWidget *parent)
{
QAction *act = theDebuggerAction(UseAlternatingRowColors);
+ setAttribute(Qt::WA_MacShowFocusRect, false);
setFrameStyle(QFrame::NoFrame);
setWindowTitle(tr("Thread"));
setAlternatingRowColors(act->isChecked());
diff --git a/src/plugins/debugger/watchwindow.cpp b/src/plugins/debugger/watchwindow.cpp
index ff7bb1404d0..07c0c13358c 100644
--- a/src/plugins/debugger/watchwindow.cpp
+++ b/src/plugins/debugger/watchwindow.cpp
@@ -127,6 +127,7 @@ WatchWindow::WatchWindow(Type type, DebuggerManager *manager, QWidget *parent)
QAction *act = theDebuggerAction(UseAlternatingRowColors);
setFrameStyle(QFrame::NoFrame);
+ setAttribute(Qt::WA_MacShowFocusRect, false);
setWindowTitle(tr("Locals and Watchers"));
setAlternatingRowColors(act->isChecked());
setIndentation(indentation() * 9/10);
diff --git a/src/plugins/qmlinspector/components/objectpropertiesview.cpp b/src/plugins/qmlinspector/components/objectpropertiesview.cpp
index b1788258112..b6bb4f18a8c 100644
--- a/src/plugins/qmlinspector/components/objectpropertiesview.cpp
+++ b/src/plugins/qmlinspector/components/objectpropertiesview.cpp
@@ -79,6 +79,7 @@ ObjectPropertiesView::ObjectPropertiesView(QDeclarativeEngineDebug *client, QWid
setLayout(layout);
m_tree = new QTreeWidget(this);
+ m_tree->setAttribute(Qt::WA_MacShowFocusRect, false);
m_tree->setFrameStyle(QFrame::NoFrame);
m_tree->setAlternatingRowColors(true);
m_tree->setExpandsOnDoubleClick(false);
diff --git a/src/plugins/qmlinspector/components/objecttree.cpp b/src/plugins/qmlinspector/components/objecttree.cpp
index 23565d2fe00..2723387ee6b 100644
--- a/src/plugins/qmlinspector/components/objecttree.cpp
+++ b/src/plugins/qmlinspector/components/objecttree.cpp
@@ -47,6 +47,7 @@ ObjectTree::ObjectTree(QDeclarativeEngineDebug *client, QWidget *parent)
m_client(client),
m_query(0)
{
+ setAttribute(Qt::WA_MacShowFocusRect, false);
setFrameStyle(QFrame::NoFrame);
setHeaderHidden(true);
setMinimumWidth(250);
diff --git a/src/plugins/qmlinspector/components/watchtable.cpp b/src/plugins/qmlinspector/components/watchtable.cpp
index 74b61da3d8c..f64108c3c61 100644
--- a/src/plugins/qmlinspector/components/watchtable.cpp
+++ b/src/plugins/qmlinspector/components/watchtable.cpp
@@ -296,6 +296,7 @@ WatchTableView::WatchTableView(WatchTableModel *model, QWidget *parent)
: QTableView(parent),
m_model(model)
{
+ setAttribute(Qt::WA_MacShowFocusRect, false);
setFrameStyle(QFrame::NoFrame);
setAlternatingRowColors(true);
setSelectionMode(QAbstractItemView::SingleSelection);
--
GitLab