3 files changed, 0 insertions, 33 deletions
diff --git a/src/widgets/itemviews/qabstractitemview.cpp b/src/widgets/itemviews/qabstractitemview.cpp
index d4c83cb82c..2ed5df46b8 100644
--- a/src/widgets/itemviews/qabstractitemview.cpp
+++ b/src/widgets/itemviews/qabstractitemview.cpp
@@ -3727,12 +3727,10 @@ QStyleOptionViewItem QAbstractItemView::viewOptions() const
     option.state &= ~QStyle::State_MouseOver;
     option.font = font();
 
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
     // On mac the focus appearance follows window activation
     // not widget activation
     if (!hasFocus())
         option.state &= ~QStyle::State_Active;
-#endif
 
     option.state &= ~QStyle::State_HasFocus;
     if (d->iconSize.isValid()) {
diff --git a/src/widgets/itemviews/qheaderview.cpp b/src/widgets/itemviews/qheaderview.cpp
index c4766a74bd..d7bdf6aa4c 100644
--- a/src/widgets/itemviews/qheaderview.cpp
+++ b/src/widgets/itemviews/qheaderview.cpp
@@ -2570,7 +2570,6 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
     if (pos < 0 && d->state != QHeaderViewPrivate::SelectSections)
         return;
     if (e->buttons() == Qt::NoButton) {
-#if 1 // Used to be excluded in Qt4 for Q_WS_MAC
         // Under Cocoa, when the mouse button is released, may include an extra
         // simulated mouse moved event. The state of the buttons when this event
         // is generated is already "no button" and the code below gets executed
@@ -2578,7 +2577,6 @@ void QHeaderView::mouseMoveEvent(QMouseEvent *e)
         // column dragging from working. So this code is disabled under Cocoa.
         d->state = QHeaderViewPrivate::NoState;
         d->pressed = -1;
-#endif
     }
     switch (d->state) {
         case QHeaderViewPrivate::ResizeSection: {
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp
index 53e546bb4d..823be1ca08 100644
--- a/src/widgets/itemviews/qtreeview.cpp
+++ b/src/widgets/itemviews/qtreeview.cpp
@@ -2173,35 +2173,6 @@ QModelIndex QTreeView::moveCursor(CursorAction cursorAction, Qt::KeyboardModifie
         return QModelIndex();
     }
     int vi = -1;
-#if 0 /* Used to be included in Qt4 for Q_WS_MAC */ && QT_CONFIG(style_mac)
-    // Selection behavior is slightly different on the Mac.
-    if (d->selectionMode == QAbstractItemView::ExtendedSelection
-        && d->selectionModel
-        && d->selectionModel->hasSelection()) {
-
-        const bool moveUpDown = (cursorAction == MoveUp || cursorAction == MoveDown);
-        const bool moveNextPrev = (cursorAction == MoveNext || cursorAction == MovePrevious);
-        const bool contiguousSelection = moveUpDown && (modifiers & Qt::ShiftModifier);
-
-        // Use the outermost index in the selection as the current index
-        if (!contiguousSelection && (moveUpDown || moveNextPrev)) {
-
-            // Find outermost index.
-            const bool useTopIndex = (cursorAction == MoveUp || cursorAction == MovePrevious);
-            int index = useTopIndex ? INT_MAX : INT_MIN;
-            const QItemSelection selection = d->selectionModel->selection();
-            for (int i = 0; i < selection.count(); ++i) {
-                const QItemSelectionRange &range = selection.at(i);
-                int candidate = d->viewIndex(useTopIndex ? range.topLeft() : range.bottomRight());
-                if (candidate >= 0)
-                    index = useTopIndex ? qMin(index, candidate) : qMax(index, candidate);
-            }
-
-            if (index >= 0 && index < INT_MAX)
-                vi = index;
-        }
-    }
-#endif
     if (vi < 0)
         vi = qMax(0, d->viewIndex(current));