diff --git a/CMakeLists.txt b/CMakeLists.txt
index b9b38af71..96d0dac61 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -652,9 +652,6 @@ katie_generate_obsolete(QStyleOptionToolBar QtGui qstyleoption.h)
 katie_generate_obsolete(QStyleOptionToolBox QtGui qstyleoption.h)
 katie_generate_obsolete(QStyleOptionToolButton QtGui qstyleoption.h)
 katie_generate_obsolete(QStyleOptionViewItem QtGui qstyleoption.h)
-katie_generate_obsolete(QStyleOptionViewItemV2 QtGui qstyleoption.h)
-katie_generate_obsolete(QStyleOptionViewItemV3 QtGui qstyleoption.h)
-katie_generate_obsolete(QStyleOptionViewItemV4 QtGui qstyleoption.h)
 katie_generate_obsolete(QTableWidgetItem QtGui qtablewidget.h)
 katie_generate_obsolete(QTableWidgetSelectionRange QtGui qtablewidget.h)
 katie_generate_obsolete(QtAlgorithms QtCore qalgorithms.h)
diff --git a/package/freebsd/pkg-plist b/package/freebsd/pkg-plist
index ddfc37e62..a40cfbc2c 100644
--- a/package/freebsd/pkg-plist
+++ b/package/freebsd/pkg-plist
@@ -543,9 +543,6 @@ include/katie/QtGui/QStyleOptionToolBar
 include/katie/QtGui/QStyleOptionToolBox
 include/katie/QtGui/QStyleOptionToolButton
 include/katie/QtGui/QStyleOptionViewItem
-include/katie/QtGui/QStyleOptionViewItemV2
-include/katie/QtGui/QStyleOptionViewItemV3
-include/katie/QtGui/QStyleOptionViewItemV4
 include/katie/QtGui/QStylePainter
 include/katie/QtGui/QStylePlugin
 include/katie/QtGui/QStyledItemDelegate
diff --git a/scripts/incfsck.py b/scripts/incfsck.py
index c9b5d75d2..458367b56 100755
--- a/scripts/incfsck.py
+++ b/scripts/incfsck.py
@@ -205,9 +205,6 @@ incmap = {
         'QStyleOptionToolBox': 'qstyleoption.h',
         'QStyleOptionToolButton': 'qstyleoption.h',
         'QStyleOptionViewItem': 'qstyleoption.h',
-        'QStyleOptionViewItemV2': 'qstyleoption.h',
-        'QStyleOptionViewItemV3': 'qstyleoption.h',
-        'QStyleOptionViewItemV4': 'qstyleoption.h',
         'QTableWidgetItem': 'qtablewidget.h',
         'QTableWidgetSelectionRange': 'qtablewidget.h',
         'QTextBlock': 'qtextobject.h',
diff --git a/scripts/namefsck.py b/scripts/namefsck.py
index 5be57afe5..191bf6eef 100755
--- a/scripts/namefsck.py
+++ b/scripts/namefsck.py
@@ -429,9 +429,6 @@ classlist = [
     "QStyleOptionToolBox",
     "QStyleOptionToolButton",
     "QStyleOptionViewItem",
-    "QStyleOptionViewItemV2",
-    "QStyleOptionViewItemV3",
-    "QStyleOptionViewItemV4",
     "QStylePainter",
     "QStylePlugin",
     "QStyledItemDelegate",
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp
index 2948c4ef8..3bcf7f9b2 100644
--- a/src/gui/itemviews/qabstractitemview.cpp
+++ b/src/gui/itemviews/qabstractitemview.cpp
@@ -1552,7 +1552,7 @@ bool QAbstractItemView::viewportEvent(QEvent *event)
     case QEvent::WhatsThis: {
         QHelpEvent *he = static_cast<QHelpEvent*>(event);
         const QModelIndex index = indexAt(he->pos());
-        QStyleOptionViewItemV4 option = d->viewOptionsV4();
+        QStyleOptionViewItem option = viewOptions();
         option.rect = visualRect(index);
         option.state |= (index == currentIndex() ? QStyle::State_HasFocus : QStyle::State_None);
         bool retval = false;
@@ -1747,7 +1747,7 @@ void QAbstractItemView::mouseReleaseEvent(QMouseEvent *event)
         emit clicked(index);
         if (edited)
             return;
-        QStyleOptionViewItemV4 option = d->viewOptionsV4();
+        QStyleOptionViewItem option = viewOptions();
         if (d->pressedAlreadySelected)
             option.state |= QStyle::State_Selected;
         if (style()->styleHint(QStyle::SH_ItemView_ActivateItemOnSingleClick, &option, this))
@@ -2411,7 +2411,7 @@ void QAbstractItemView::updateEditorGeometries()
     Q_D(QAbstractItemView);
     if(d->editorIndexHash.isEmpty())
         return;
-    QStyleOptionViewItemV4 option = d->viewOptionsV4();
+    QStyleOptionViewItem option = viewOptions();
     QEditorIndexHash::iterator it = d->editorIndexHash.begin();
     QWidgetList editorsToRelease;
     QWidgetList editorsToHide;
@@ -2738,7 +2738,7 @@ QSize QAbstractItemView::sizeHintForIndex(const QModelIndex &index) const
     Q_D(const QAbstractItemView);
     if (!d->isIndexValid(index) || !d->itemDelegate)
         return QSize();
-    return d->delegateForIndex(index)->sizeHint(d->viewOptionsV4(), index);
+    return d->delegateForIndex(index)->sizeHint(viewOptions(), index);
 }
 
 /*!
@@ -2766,7 +2766,7 @@ int QAbstractItemView::sizeHintForRow(int row) const
 
     ensurePolished();
 
-    QStyleOptionViewItemV4 option = d->viewOptionsV4();
+    QStyleOptionViewItem option = viewOptions();
     int height = 0;
     int colCount = d->model->columnCount(d->root);
     QModelIndex index;
@@ -2797,7 +2797,7 @@ int QAbstractItemView::sizeHintForColumn(int column) const
 
     ensurePolished();
 
-    QStyleOptionViewItemV4 option = d->viewOptionsV4();
+    QStyleOptionViewItem option = viewOptions();
     int width = 0;
     int rows = d->model->rowCount(d->root);
     QModelIndex index;
@@ -2820,7 +2820,7 @@ int QAbstractItemView::sizeHintForColumn(int column) const
 void QAbstractItemView::openPersistentEditor(const QModelIndex &index)
 {
     Q_D(QAbstractItemView);
-    QStyleOptionViewItemV4 options = d->viewOptionsV4();
+    QStyleOptionViewItem options = viewOptions();
     options.rect = visualRect(index);
     options.state |= (index == currentIndex() ? QStyle::State_HasFocus : QStyle::State_None);
 
@@ -3318,18 +3318,11 @@ QStyleOptionViewItem QAbstractItemView::viewOptions() const
     option.textElideMode = d->textElideMode;
     option.rect = QRect();
     option.showDecorationSelected = style()->styleHint(QStyle::SH_ItemView_ShowDecorationSelected, 0, this);
-    return option;
-}
-
-QStyleOptionViewItemV4 QAbstractItemViewPrivate::viewOptionsV4() const
-{
-    Q_Q(const QAbstractItemView);
-    QStyleOptionViewItemV4 option = q->viewOptions();
-    if (wrapItemText)
-        option.features = QStyleOptionViewItemV2::WrapText;
-    option.locale = q->locale();
+    if (d->wrapItemText)
+        option.features = QStyleOptionViewItem::WrapText;
+    option.locale = locale();
     option.locale.setNumberOptions(QLocale::OmitGroupSeparator);
-    option.widget = q;
+    option.widget = this;
     return option;
 }
 
@@ -3915,7 +3908,7 @@ bool QAbstractItemViewPrivate::sendDelegateEvent(const QModelIndex &index, QEven
 {
     Q_Q(const QAbstractItemView);
     QModelIndex buddy = model->buddy(index);
-    QStyleOptionViewItemV4 options = viewOptionsV4();
+    QStyleOptionViewItem options = q->viewOptions();
     options.rect = q->visualRect(buddy);
     options.state |= (buddy == q->currentIndex() ? QStyle::State_HasFocus : QStyle::State_None);
     QAbstractItemDelegate *delegate = delegateForIndex(index);
@@ -3927,7 +3920,7 @@ bool QAbstractItemViewPrivate::openEditor(const QModelIndex &index, QEvent *even
     Q_Q(QAbstractItemView);
 
     QModelIndex buddy = model->buddy(index);
-    QStyleOptionViewItemV4 options = viewOptionsV4();
+    QStyleOptionViewItem options = q->viewOptions();
     options.rect = q->visualRect(buddy);
     options.state |= (buddy == q->currentIndex() ? QStyle::State_HasFocus : QStyle::State_None);
 
@@ -3973,13 +3966,14 @@ QItemViewPaintPairs QAbstractItemViewPrivate::draggablePaintPairs(const QModelIn
 QPixmap QAbstractItemViewPrivate::renderToPixmap(const QModelIndexList &indexes, QRect *r) const
 {
     Q_ASSERT(r);
+    Q_Q(const QAbstractItemView);
     QItemViewPaintPairs paintPairs = draggablePaintPairs(indexes, r);
     if (paintPairs.isEmpty())
         return QPixmap();
     QPixmap pixmap(r->size());
     pixmap.fill(Qt::transparent);
     QPainter painter(&pixmap);
-    QStyleOptionViewItemV4 option = viewOptionsV4();
+    QStyleOptionViewItem option = q->viewOptions();
     option.state |= QStyle::State_Selected;
     for (int j = 0; j < paintPairs.count(); ++j) {
         option.rect = paintPairs.at(j).first.translated(-r->topLeft());
diff --git a/src/gui/itemviews/qabstractitemview_p.h b/src/gui/itemviews/qabstractitemview_p.h
index 506607a68..d13a4cc3f 100644
--- a/src/gui/itemviews/qabstractitemview_p.h
+++ b/src/gui/itemviews/qabstractitemview_p.h
@@ -161,7 +161,7 @@ public:
 #endif
     virtual QItemViewPaintPairs draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const;
     // reimplemented in subclasses
-    virtual void adjustViewOptionsForIndex(QStyleOptionViewItemV4*, const QModelIndex&) const {}
+    virtual void adjustViewOptionsForIndex(QStyleOptionViewItem*, const QModelIndex&) const {}
 
     inline void releaseEditor(QWidget *editor) const {
         if (editor) {
@@ -304,8 +304,6 @@ public:
 
     QModelIndexList selectedDraggableIndexes() const;
 
-    QStyleOptionViewItemV4 viewOptionsV4() const;
-
     void doDelayedReset()
     {
         //we delay the reset of the timer because some views (QTableView)
diff --git a/src/gui/itemviews/qcolumnview.cpp b/src/gui/itemviews/qcolumnview.cpp
index c71977610..a47760c0d 100644
--- a/src/gui/itemviews/qcolumnview.cpp
+++ b/src/gui/itemviews/qcolumnview.cpp
@@ -1104,7 +1104,7 @@ void QColumnViewDelegate::paint(QPainter *painter,
     bool reverse = (option.direction == Qt::RightToLeft);
     int width = ((option.rect.height() * 2) / 3);
     // Modify the options to give us room to add an arrow
-    QStyleOptionViewItemV4 opt = option;
+    QStyleOptionViewItem opt = option;
     if (reverse)
         opt.rect.adjust(width,0,0,0);
     else
diff --git a/src/gui/itemviews/qitemdelegate.cpp b/src/gui/itemviews/qitemdelegate.cpp
index 5f91ca5b5..0ae6ee7eb 100644
--- a/src/gui/itemviews/qitemdelegate.cpp
+++ b/src/gui/itemviews/qitemdelegate.cpp
@@ -85,14 +85,14 @@ public:
             return text;
         }
 
-    static QString valueToText(const QVariant &value, const QStyleOptionViewItemV4 &option);
+    static QString valueToText(const QVariant &value, const QStyleOptionViewItem &option);
 
     void _q_commitDataAndCloseEditor(QWidget *editor);
 
     QItemEditorFactory *f;
     bool clipPainting;
 
-    QRect textLayoutBounds(const QStyleOptionViewItemV2 &options) const;
+    QRect textLayoutBounds(const QStyleOptionViewItem &options) const;
     QSizeF doTextLayout(int lineWidth) const;
     mutable QTextLayout textLayout;
     mutable QTextOption textOption;
@@ -112,10 +112,10 @@ void QItemDelegatePrivate::_q_commitDataAndCloseEditor(QWidget *editor)
     emit q->closeEditor(editor, QAbstractItemDelegate::SubmitModelCache);
 }
 
-QRect QItemDelegatePrivate::textLayoutBounds(const QStyleOptionViewItemV2 &option) const
+QRect QItemDelegatePrivate::textLayoutBounds(const QStyleOptionViewItem &option) const
 {
     QRect rect = option.rect;
-    const bool wrapText = option.features & QStyleOptionViewItemV2::WrapText;
+    const bool wrapText = option.features & QStyleOptionViewItem::WrapText;
     switch (option.decorationPosition) {
     case QStyleOptionViewItem::Left:
     case QStyleOptionViewItem::Right:
@@ -305,7 +305,7 @@ void QItemDelegate::setClipping(bool clip)
     d->clipPainting = clip;
 }
 
-QString QItemDelegatePrivate::valueToText(const QVariant &value, const QStyleOptionViewItemV4 &option)
+QString QItemDelegatePrivate::valueToText(const QVariant &value, const QStyleOptionViewItem &option)
 {
     QString text;
     switch (value.userType()) {
@@ -370,7 +370,7 @@ void QItemDelegate::paint(QPainter *painter,
     Q_D(const QItemDelegate);
     Q_ASSERT(index.isValid());
 
-    QStyleOptionViewItemV4 opt = setOptions(index, option);
+    QStyleOptionViewItem opt = setOptions(index, option);
 
     // prepare
     painter->save();
@@ -639,7 +639,7 @@ void QItemDelegate::drawDisplay(QPainter *painter, const QStyleOptionViewItem &o
     QStyle *style = option.widget ? option.widget->style() : QApplication::style();
     const int textMargin = style->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, option.widget) + 1;
     QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding
-    const bool wrapText = option.features & QStyleOptionViewItemV2::WrapText;
+    const bool wrapText = option.features & QStyleOptionViewItem::WrapText;
     d->textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::NoWrap);
     d->textOption.setTextDirection(option.direction);
     d->textOption.setAlignment(QStyle::visualAlignment(option.direction, option.displayAlignment));
diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp
index 3f52861ac..f0cae8a9d 100644
--- a/src/gui/itemviews/qlistview.cpp
+++ b/src/gui/itemviews/qlistview.cpp
@@ -899,7 +899,7 @@ void QListView::paintEvent(QPaintEvent *e)
     Q_D(QListView);
     if (!d->itemDelegate)
         return;
-    QStyleOptionViewItemV4 option = d->viewOptionsV4();
+    QStyleOptionViewItem option = viewOptions();
     QPainter painter(d->viewport);
 
     const QVector<QModelIndex> toBeRendered = d->intersectingSet(e->rect().translated(horizontalOffset(), verticalOffset()), false);
@@ -968,9 +968,9 @@ void QListView::paintEvent(QPaintEvent *e)
                 }
             }
             if (alternateBase) {
-                option.features |= QStyleOptionViewItemV2::Alternate;
+                option.features |= QStyleOptionViewItem::Alternate;
             } else {
-                option.features &= ~QStyleOptionViewItemV2::Alternate;
+                option.features &= ~QStyleOptionViewItem::Alternate;
             }
 
             // draw background of the item (only alternate row). rest of the background
@@ -1409,7 +1409,7 @@ void QListView::updateGeometries()
         verticalScrollBar()->setRange(0, 0);
     } else {
         QModelIndex index = d->model->index(0, d->column, d->root);
-        QStyleOptionViewItemV4 option = d->viewOptionsV4();
+        QStyleOptionViewItem option = viewOptions();
         QSize step = d->itemSize(option, index);
         d->commonListView->updateHorizontalScrollBar(step);
         d->commonListView->updateVerticalScrollBar(step);
@@ -2240,7 +2240,7 @@ QListViewItem QListModeViewBase::indexToListViewItem(const QModelIndex &index) c
                                            0, segmentStartRows.count() - 1);
 
 
-    QStyleOptionViewItemV4 options = viewOptions();
+    QStyleOptionViewItem options = qq->viewOptions();
     options.rect.setSize(contentsSize);
     QSize size = (uniformItemSizes() && cachedItemSize().isValid())
                  ? cachedItemSize() : itemSize(options, index);
@@ -2305,7 +2305,7 @@ void QListModeViewBase::doStaticLayout(const QListViewLayoutInfo &info)
 {
     const bool useItemSize = !info.grid.isValid();
     const QPoint topLeft = initStaticLayout(info);
-    QStyleOptionViewItemV4 option = viewOptions();
+    QStyleOptionViewItem option = qq->viewOptions();
     option.rect = info.bounds;
     option.rect.adjust(info.spacing, info.spacing, -info.spacing, -info.spacing);
 
@@ -2759,7 +2759,7 @@ void QIconModeViewBase::scrollContentsBy(int dx, int dy, bool scrollElasticBand)
 void QIconModeViewBase::dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight)
 {
     if (column() >= topLeft.column() && column() <= bottomRight.column())  {
-        QStyleOptionViewItemV4 option = viewOptions();
+        QStyleOptionViewItem option = qq->viewOptions();
         int bottom = qMin(items.count(), bottomRight.row() + 1);
         for (int row = topLeft.row(); row < bottom; ++row)
             items[row].resize(itemSize(option, modelIndex(row)));
@@ -2769,8 +2769,8 @@ void QIconModeViewBase::dataChanged(const QModelIndex &topLeft, const QModelInde
 bool QIconModeViewBase::doBatchedItemLayout(const QListViewLayoutInfo &info, int max)
 {
     if (info.last >= items.count()) {
-        //first we create the items
-        QStyleOptionViewItemV4 option = viewOptions();
+        // first we create the items
+        QStyleOptionViewItem option = qq->viewOptions();
         for (int row = items.count(); row <= info.last; ++row) {
             QSize size = itemSize(option, modelIndex(row));
             QListViewItem item(QRect(0, 0, size.width(), size.height()), row); // default pos
diff --git a/src/gui/itemviews/qlistview.h b/src/gui/itemviews/qlistview.h
index 274a0ab52..efcc28e5a 100644
--- a/src/gui/itemviews/qlistview.h
+++ b/src/gui/itemviews/qlistview.h
@@ -156,6 +156,9 @@ protected:
     bool isIndexHidden(const QModelIndex &index) const;
 
 private:
+    friend class QListModeViewBase;
+    friend class QIconModeViewBase;
+
     int visualIndex(const QModelIndex &index) const;
 
     Q_DECLARE_PRIVATE(QListView)
diff --git a/src/gui/itemviews/qlistview_p.h b/src/gui/itemviews/qlistview_p.h
index 1eb42723c..b68a79eb6 100644
--- a/src/gui/itemviews/qlistview_p.h
+++ b/src/gui/itemviews/qlistview_p.h
@@ -156,13 +156,12 @@ public:
     inline QModelIndex modelIndex(int row) const;
     inline int rowCount() const;
 
-    inline QStyleOptionViewItemV4 viewOptions() const;
     inline QWidget *viewport() const;
     inline QRect clipRect() const;
 
     inline QSize cachedItemSize() const;
     inline QRect viewItemRect(const QListViewItem &item) const;
-    inline QSize itemSize(const QStyleOptionViewItemV2 &opt, const QModelIndex &idx) const;
+    inline QSize itemSize(const QStyleOptionViewItem &opt, const QModelIndex &idx) const;
     inline QAbstractItemDelegate *delegate(const QModelIndex &idx) const;
 
     inline bool isHidden(int row) const;
@@ -446,13 +445,12 @@ inline QModelIndex QCommonListViewBase::modelIndex(int row) const
     { return dd->model->index(row, dd->column, dd->root); }
 inline int QCommonListViewBase::rowCount() const { return dd->model->rowCount(dd->root); }
 
-inline QStyleOptionViewItemV4 QCommonListViewBase::viewOptions() const { return dd->viewOptionsV4(); }
 inline QWidget *QCommonListViewBase::viewport() const { return dd->viewport; }
 inline QRect QCommonListViewBase::clipRect() const { return dd->clipRect(); }
 
 inline QSize QCommonListViewBase::cachedItemSize() const { return dd->cachedItemSize; }
 inline QRect QCommonListViewBase::viewItemRect(const QListViewItem &item) const { return dd->viewItemRect(item); }
-inline QSize QCommonListViewBase::itemSize(const QStyleOptionViewItemV2 &opt, const QModelIndex &idx) const
+inline QSize QCommonListViewBase::itemSize(const QStyleOptionViewItem &opt, const QModelIndex &idx) const
     { return dd->itemSize(opt, idx); }
 
 inline QAbstractItemDelegate *QCommonListViewBase::delegate(const QModelIndex &idx) const
diff --git a/src/gui/itemviews/qstyleditemdelegate.cpp b/src/gui/itemviews/qstyleditemdelegate.cpp
index 5af3eb783..c44012a76 100644
--- a/src/gui/itemviews/qstyleditemdelegate.cpp
+++ b/src/gui/itemviews/qstyleditemdelegate.cpp
@@ -277,9 +277,7 @@ QString QStyledItemDelegate::displayText(const QVariant &value, const QLocale& l
 /*!
     Initialize \a option with the values using the index \a index. This method
     is useful for subclasses when they need a QStyleOptionViewItem, but don't want
-    to fill in all the information themselves. This function will check the version
-    of the QStyleOptionViewItem and fill in the additional values for a
-    QStyleOptionViewItemV2, QStyleOptionViewItemV3 and QStyleOptionViewItemV4.
+    to fill in all the information themselves.
 
     \sa QStyleOption::initFrom()
 */
@@ -303,13 +301,13 @@ void QStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option,
     option->index = index;
     value = index.data(Qt::CheckStateRole);
     if (value.isValid() && !value.isNull()) {
-        option->features |= QStyleOptionViewItemV2::HasCheckIndicator;
+        option->features |= QStyleOptionViewItem::HasCheckIndicator;
         option->checkState = static_cast<Qt::CheckState>(value.toInt());
     }
 
     value = index.data(Qt::DecorationRole);
     if (value.isValid() && !value.isNull()) {
-        option->features |= QStyleOptionViewItemV2::HasDecoration;
+        option->features |= QStyleOptionViewItem::HasDecoration;
         switch (value.type()) {
         case QVariant::Icon: {
             option->icon = qvariant_cast<QIcon>(value);
@@ -349,7 +347,7 @@ void QStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option,
 
     value = index.data(Qt::DisplayRole);
     if (value.isValid() && !value.isNull()) {
-        option->features |= QStyleOptionViewItemV2::HasDisplay;
+        option->features |= QStyleOptionViewItem::HasDisplay;
         option->text = displayText(value, option->locale);
     }
 
@@ -365,7 +363,7 @@ void QStyledItemDelegate::initStyleOption(QStyleOptionViewItem *option,
     When reimplementing paint in a subclass. Use the initStyleOption()
     to set up the \a option in the same way as the
     QStyledItemDelegate; the option will always be an instance of
-    QStyleOptionViewItemV4. Please see its class description for
+    QStyleOptionViewItem. Please see its class description for
     information on its contents.
 
     Whenever possible, use the \a option while painting.
@@ -385,7 +383,7 @@ void QStyledItemDelegate::paint(QPainter *painter,
 {
     Q_ASSERT(index.isValid());
 
-    QStyleOptionViewItemV4 opt = option;
+    QStyleOptionViewItem opt = option;
     initStyleOption(&opt, index);
 
     QStyle *style = option.widget ? option.widget->style() : QApplication::style();
@@ -409,7 +407,7 @@ QSize QStyledItemDelegate::sizeHint(const QStyleOptionViewItem &option,
     if (value.isValid())
         return qvariant_cast<QSize>(value);
 
-    QStyleOptionViewItemV4 opt = option;
+    QStyleOptionViewItem opt = option;
     initStyleOption(&opt, index);
 
     QStyle *style = option.widget ? option.widget->style() : QApplication::style();
@@ -520,7 +518,7 @@ void QStyledItemDelegate::updateEditorGeometry(QWidget *editor,
     Q_ASSERT(index.isValid());
     const QWidget *widget = option.widget;
 
-    QStyleOptionViewItemV4 opt = option;
+    QStyleOptionViewItem opt = option;
     initStyleOption(&opt, index);
     // let the editor take up all available space 
     //if the editor is not a QLineEdit
@@ -696,7 +694,7 @@ bool QStyledItemDelegate::editorEvent(QEvent *event,
     if ((event->type() == QEvent::MouseButtonRelease)
         || (event->type() == QEvent::MouseButtonDblClick)
         || (event->type() == QEvent::MouseButtonPress)) {
-        QStyleOptionViewItemV4 viewOpt(option);
+        QStyleOptionViewItem viewOpt(option);
         initStyleOption(&viewOpt, index);
         QRect checkRect = style->subElementRect(QStyle::SE_ItemViewItemCheckIndicator, &viewOpt, option.widget);
         QMouseEvent *me = static_cast<QMouseEvent*>(event);
diff --git a/src/gui/itemviews/qtableview.cpp b/src/gui/itemviews/qtableview.cpp
index 5e376856e..45739b30a 100644
--- a/src/gui/itemviews/qtableview.cpp
+++ b/src/gui/itemviews/qtableview.cpp
@@ -733,7 +733,7 @@ QRect QTableViewPrivate::visualSpanRect(const QSpanCollection::Span &span) const
   \a drawn is a QBitArray of visualRowCountxvisualCoulumnCount which say if particular cell has been drawn
 */
 void QTableViewPrivate::drawAndClipSpans(const QRegion &area, QPainter *painter,
-                                         const QStyleOptionViewItemV4 &option, QBitArray *drawn,
+                                         const QStyleOptionViewItem &option, QBitArray *drawn,
                                          int firstVisualRow, int lastVisualRow, int firstVisualColumn, int lastVisualColumn)
 {
     bool alternateBase = false;
@@ -765,13 +765,13 @@ void QTableViewPrivate::drawAndClipSpans(const QRegion &area, QPainter *painter,
         rect.translate(scrollDelayOffset);
         if (!area.intersects(rect))
             continue;
-        QStyleOptionViewItemV4 opt = option;
+        QStyleOptionViewItem opt = option;
         opt.rect = rect;
         alternateBase = alternatingColors && (span->top() & 1);
         if (alternateBase)
-            opt.features |= QStyleOptionViewItemV2::Alternate;
+            opt.features |= QStyleOptionViewItem::Alternate;
         else
-            opt.features &= ~QStyleOptionViewItemV2::Alternate;
+            opt.features &= ~QStyleOptionViewItem::Alternate;
         drawCell(painter, opt, index);
         region -= rect;
         for (int r = span->top(); r <= span->bottom(); ++r) {
@@ -835,10 +835,10 @@ void QTableViewPrivate::_q_updateSpanRemovedColumns(const QModelIndex &parent, i
   \internal
   Draws a table cell.
 */
-void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItemV4 &option, const QModelIndex &index)
+void QTableViewPrivate::drawCell(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index)
 {
     Q_Q(QTableView);
-    QStyleOptionViewItemV4 opt = option;
+    QStyleOptionViewItem opt = option;
 
     if (selectionModel && selectionModel->isSelected(index))
         opt.state |= QStyle::State_Selected;
@@ -1233,7 +1233,7 @@ void QTableView::paintEvent(QPaintEvent *event)
 {
     Q_D(QTableView);
     // setup temp variables for the painting
-    QStyleOptionViewItemV4 option = d->viewOptionsV4();
+    QStyleOptionViewItem option = viewOptions();
     const QPoint offset = d->scrollDelayOffset;
     const bool showGrid = d->showGrid;
     const int gridSize = showGrid ? 1 : 0;
@@ -1349,9 +1349,9 @@ void QTableView::paintEvent(QPaintEvent *event)
                     option.rect = QRect(colp + (showGrid && rightToLeft ? 1 : 0), rowY, colw, rowh);
                     if (alternate) {
                         if (alternateBase)
-                            option.features |= QStyleOptionViewItemV2::Alternate;
+                            option.features |= QStyleOptionViewItem::Alternate;
                         else
-                            option.features &= ~QStyleOptionViewItemV2::Alternate;
+                            option.features &= ~QStyleOptionViewItem::Alternate;
                     }
                     d->drawCell(&painter, option, index);
                 }
@@ -2094,7 +2094,7 @@ int QTableView::sizeHintForRow(int row) const
     if (right == -1) // the table don't have enough columns to fill the viewport
         right = d->model->columnCount(d->root) - 1;
 
-    QStyleOptionViewItemV4 option = d->viewOptionsV4();
+    QStyleOptionViewItem option = viewOptions();
 
     int hint = 0;
     QModelIndex index;
@@ -2153,7 +2153,7 @@ int QTableView::sizeHintForColumn(int column) const
     if (!isVisible() || bottom == -1) // the table don't have enough rows to fill the viewport
         bottom = d->model->rowCount(d->root) - 1;
 
-    QStyleOptionViewItemV4 option = d->viewOptionsV4();
+    QStyleOptionViewItem option = viewOptions();
 
     int hint = 0;
     QModelIndex index;
diff --git a/src/gui/itemviews/qtableview_p.h b/src/gui/itemviews/qtableview_p.h
index af6e6faa0..10ce743d8 100644
--- a/src/gui/itemviews/qtableview_p.h
+++ b/src/gui/itemviews/qtableview_p.h
@@ -151,9 +151,9 @@ public:
     int sectionSpanSize(const QHeaderView *header, int logical, int span) const;
     bool spanContainsSection(const QHeaderView *header, int logical, int spanLogical, int span) const;
     void drawAndClipSpans(const QRegion &area, QPainter *painter,
-                          const QStyleOptionViewItemV4 &option, QBitArray *drawn,
+                          const QStyleOptionViewItem &option, QBitArray *drawn,
                           int firstVisualRow, int lastVisualRow, int firstVisualColumn, int lastVisualColumn);
-    void drawCell(QPainter *painter, const QStyleOptionViewItemV4 &option, const QModelIndex &index);
+    void drawCell(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index);
 
     bool showGrid;
     Qt::PenStyle gridStyle;
diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp
index 28f1be6df..495d3d8e3 100644
--- a/src/gui/itemviews/qtreeview.cpp
+++ b/src/gui/itemviews/qtreeview.cpp
@@ -1249,7 +1249,7 @@ void QTreeView::paintEvent(QPaintEvent *event)
     }
 }
 
-void QTreeViewPrivate::paintAlternatingRowColors(QPainter *painter, QStyleOptionViewItemV4 *option, int y, int bottom) const
+void QTreeViewPrivate::paintAlternatingRowColors(QPainter *painter, QStyleOptionViewItem *option, int y, int bottom) const
 {
     Q_Q(const QTreeView);
     if (!alternatingColors || !q->style()->styleHint(QStyle::SH_ItemView_PaintAlternatingRowColorsForEmptyArea, option, q))
@@ -1263,9 +1263,9 @@ void QTreeViewPrivate::paintAlternatingRowColors(QPainter *painter, QStyleOption
     while (y <= bottom) {
         option->rect.setRect(0, y, viewport->width(), rowHeight);
         if (current & 1) {
-            option->features |= QStyleOptionViewItemV2::Alternate;
+            option->features |= QStyleOptionViewItem::Alternate;
         } else {
-            option->features &= ~QStyleOptionViewItemV2::Alternate;
+            option->features &= ~QStyleOptionViewItem::Alternate;
         }
         ++current;
         q->style()->drawPrimitive(QStyle::PE_PanelItemViewRow, option, painter, q);
@@ -1325,7 +1325,7 @@ QItemViewPaintPairs QTreeViewPrivate::draggablePaintPairs(const QModelIndexList
     return QAbstractItemViewPrivate::draggablePaintPairs(list, r);
 }
 
-void QTreeViewPrivate::adjustViewOptionsForIndex(QStyleOptionViewItemV4 *option, const QModelIndex &current) const
+void QTreeViewPrivate::adjustViewOptionsForIndex(QStyleOptionViewItem *option, const QModelIndex &current) const
 {
     const int row = viewIndex(current); // get the index in viewItems[]
     option->state = option->state | (viewItems.at(row).expanded ? QStyle::State_Open : QStyle::State_None)
@@ -1336,7 +1336,7 @@ void QTreeViewPrivate::adjustViewOptionsForIndex(QStyleOptionViewItemV4 *option,
                                      || option->showDecorationSelected;
 
     QVector<int> logicalIndices; // index = visual index of visible columns only. data = logical index.
-    QVector<QStyleOptionViewItemV4::ViewItemPosition> viewItemPosList; // vector of left/middle/end for each logicalIndex, visible columns only.
+    QVector<QStyleOptionViewItem::ViewItemPosition> viewItemPosList; // vector of left/middle/end for each logicalIndex, visible columns only.
     const bool spanning = viewItems.at(row).spanning;
     const int left = (spanning ? header->visualIndex(0) : 0);
     const int right = (spanning ? header->visualIndex(0) : header->count() - 1 );
@@ -1359,7 +1359,7 @@ void QTreeView::drawTree(QPainter *painter, const QRegion &region) const
     Q_D(const QTreeView);
     const QVector<QTreeViewItem> viewItems = d->viewItems;
 
-    QStyleOptionViewItemV4 option = d->viewOptionsV4();
+    QStyleOptionViewItem option = viewOptions();
     const QStyle::State state = option.state;
     d->current = 0;
 
@@ -1434,12 +1434,12 @@ static inline bool ancestorOf(QObject *widget, QObject *other)
     return false;
 }
 
-void QTreeViewPrivate::calcLogicalIndices(QVector<int> *logicalIndices, QVector<QStyleOptionViewItemV4::ViewItemPosition> *itemPositions, int left, int right) const
+void QTreeViewPrivate::calcLogicalIndices(QVector<int> *logicalIndices, QVector<QStyleOptionViewItem::ViewItemPosition> *itemPositions, int left, int right) const
 {
     const int columnCount = header->count();
     /* 'left' and 'right' are the left-most and right-most visible visual indices.
        Compute the first visible logical indices before and after the left and right.
-       We will use these values to determine the QStyleOptionViewItemV4::viewItemPosition. */
+       We will use these values to determine the QStyleOptionViewItem::viewItemPosition. */
     int logicalIndexBeforeLeft = -1, logicalIndexAfterRight = -1;
     for (int visualIndex = left - 1; visualIndex >= 0; --visualIndex) {
         int logicalIndex = header->logicalIndex(visualIndex);
@@ -1470,16 +1470,16 @@ void QTreeViewPrivate::calcLogicalIndices(QVector<int> *logicalIndices, QVector<
         int prevLogicalSection = currentLogicalSection - 1 < 0
                                  ? logicalIndexBeforeLeft
                                  : logicalIndices->at(currentLogicalSection - 1);
-        QStyleOptionViewItemV4::ViewItemPosition pos;
+        QStyleOptionViewItem::ViewItemPosition pos;
         if (columnCount == 1 || (nextLogicalSection == 0 && prevLogicalSection == -1)
             || (headerSection == 0 && nextLogicalSection == -1) || spanning)
-            pos = QStyleOptionViewItemV4::OnlyOne;
+            pos = QStyleOptionViewItem::OnlyOne;
         else if (headerSection == 0 || (nextLogicalSection != 0 && prevLogicalSection == -1))
-            pos = QStyleOptionViewItemV4::Beginning;
+            pos = QStyleOptionViewItem::Beginning;
         else if (nextLogicalSection == 0 || nextLogicalSection == -1)
-            pos = QStyleOptionViewItemV4::End;
+            pos = QStyleOptionViewItem::End;
         else
-            pos = QStyleOptionViewItemV4::Middle;
+            pos = QStyleOptionViewItem::Middle;
         (*itemPositions)[currentLogicalSection] = pos;
     }
 }
@@ -1496,7 +1496,7 @@ void QTreeView::drawRow(QPainter *painter, const QStyleOptionViewItem &option,
                         const QModelIndex &index) const
 {
     Q_D(const QTreeView);
-    QStyleOptionViewItemV4 opt = option;
+    QStyleOptionViewItem opt = option;
     const QPoint offset = d->scrollDelayOffset;
     const int y = option.rect.y() + offset.y();
     const QModelIndex parent = index.parent();
@@ -1558,7 +1558,7 @@ void QTreeView::drawRow(QPainter *painter, const QStyleOptionViewItem &option,
                   && index.row() == hover.row();
 
     QVector<int> logicalIndices;
-    QVector<QStyleOptionViewItemV4::ViewItemPosition> viewItemPosList; // vector of left/middle/end for each logicalIndex
+    QVector<QStyleOptionViewItem::ViewItemPosition> viewItemPosList; // vector of left/middle/end for each logicalIndex
     d->calcLogicalIndices(&logicalIndices, &viewItemPosList, left, right);
 
     for (int currentLogicalSection = 0; currentLogicalSection < logicalIndices.count(); ++currentLogicalSection) {
@@ -1616,9 +1616,9 @@ void QTreeView::drawRow(QPainter *painter, const QStyleOptionViewItem &option,
 
         if (alternate) {
             if (d->current & 1) {
-                opt.features |= QStyleOptionViewItemV2::Alternate;
+                opt.features |= QStyleOptionViewItem::Alternate;
             } else {
-                opt.features &= ~QStyleOptionViewItemV2::Alternate;
+                opt.features &= ~QStyleOptionViewItem::Alternate;
             }
         }
 
@@ -1706,7 +1706,7 @@ void QTreeView::drawBranches(QPainter *painter, const QRect &rect,
     QModelIndex current = parent;
     QModelIndex ancestor = current.parent();
 
-    QStyleOptionViewItemV2 opt = viewOptions();
+    QStyleOptionViewItem opt = viewOptions();
     QStyle::State extraFlags = QStyle::State_None;
     if (isEnabled())
         extraFlags |= QStyle::State_Enabled;
@@ -1718,9 +1718,9 @@ void QTreeView::drawBranches(QPainter *painter, const QRect &rect,
 
     if (d->alternatingColors) {
         if (d->current & 1) {
-            opt.features |= QStyleOptionViewItemV2::Alternate;
+            opt.features |= QStyleOptionViewItem::Alternate;
         } else {
-            opt.features &= ~QStyleOptionViewItemV2::Alternate;
+            opt.features &= ~QStyleOptionViewItem::Alternate;
         }
     }
 
@@ -2651,7 +2651,7 @@ int QTreeView::sizeHintForColumn(int column) const
         return -1;
     ensurePolished();
     int w = 0;
-    QStyleOptionViewItemV4 option = d->viewOptionsV4();
+    QStyleOptionViewItem option = viewOptions();
     const QVector<QTreeViewItem> viewItems = d->viewItems;
 
     int start = 0;
@@ -2718,7 +2718,7 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const
         qSwap(end, start);
 
     int height = -1;
-    QStyleOptionViewItemV4 option = d->viewOptionsV4();
+    QStyleOptionViewItem option = viewOptions();
     // ### If we want word wrapping in the items,
     // ### we need to go through all the columns
     // ### and set the width of the column
@@ -2975,7 +2975,7 @@ QPixmap QTreeViewPrivate::renderTreeToPixmapForAnimation(const QRect &rect) cons
     painter.end();
 
     //and now let's render the editors the editors
-    QStyleOptionViewItemV4 option = viewOptionsV4();
+    QStyleOptionViewItem option = q->viewOptions();
     for (QEditorIndexHash::const_iterator it = editorIndexHash.constBegin(); it != editorIndexHash.constEnd(); ++it) {
         QWidget *editor = it.key();
         const QModelIndex &index = it.value();
diff --git a/src/gui/itemviews/qtreeview_p.h b/src/gui/itemviews/qtreeview_p.h
index d103cd435..f93559e10 100644
--- a/src/gui/itemviews/qtreeview_p.h
+++ b/src/gui/itemviews/qtreeview_p.h
@@ -77,7 +77,7 @@ public:
     void initialize();
 
     QItemViewPaintPairs draggablePaintPairs(const QModelIndexList &indexes, QRect *r) const;
-    void adjustViewOptionsForIndex(QStyleOptionViewItemV4 *option, const QModelIndex &current) const;
+    void adjustViewOptionsForIndex(QStyleOptionViewItem *option, const QModelIndex &current) const;
 
 #ifndef QT_NO_ANIMATION
     struct AnimatedOperation : public QVariantAnimation
@@ -146,11 +146,11 @@ public:
 
     void updateChildCount(const int parentItem, const int delta);
 
-    void paintAlternatingRowColors(QPainter *painter, QStyleOptionViewItemV4 *option, int y, int bottom) const;
+    void paintAlternatingRowColors(QPainter *painter, QStyleOptionViewItem *option, int y, int bottom) const;
 
     // logicalIndices: vector of currently visibly logical indices
     // itemPositions: vector of view item positions (beginning/middle/end/onlyone)
-    void calcLogicalIndices(QVector<int> *logicalIndices, QVector<QStyleOptionViewItemV4::ViewItemPosition> *itemPositions, int left, int right) const;
+    void calcLogicalIndices(QVector<int> *logicalIndices, QVector<QStyleOptionViewItem::ViewItemPosition> *itemPositions, int left, int right) const;
 
     QHeaderView *header;
     int indent;
diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp
index 0e31ff226..9fa569cb3 100644
--- a/src/gui/styles/qcommonstyle.cpp
+++ b/src/gui/styles/qcommonstyle.cpp
@@ -606,7 +606,7 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
     }
 #ifndef QT_NO_ITEMVIEWS
     case PE_PanelItemViewRow: {
-        if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+        if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             QPalette::ColorGroup cg = (widget ? widget->isEnabled() : (vopt->state & QStyle::State_Enabled))
                                       ? QPalette::Normal : QPalette::Disabled;
             if (cg == QPalette::Normal && !(vopt->state & QStyle::State_Active))
@@ -614,13 +614,13 @@ void QCommonStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, Q
 
             if ((vopt->state & QStyle::State_Selected) &&  proxy()->styleHint(QStyle::SH_ItemView_ShowDecorationSelected, opt, widget))
                 p->fillRect(vopt->rect, vopt->palette.brush(cg, QPalette::Highlight));
-            else if (vopt->features & QStyleOptionViewItemV2::Alternate)
+            else if (vopt->features & QStyleOptionViewItem::Alternate)
                 p->fillRect(vopt->rect, vopt->palette.brush(cg, QPalette::AlternateBase));
         }
         break;
     }
     case PE_PanelItemViewItem: {
-        if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+        if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             QPalette::ColorGroup cg = (widget ? widget->isEnabled() : (vopt->state & QStyle::State_Enabled))
                                       ? QPalette::Normal : QPalette::Disabled;
             if (cg == QPalette::Normal && !(vopt->state & QStyle::State_Active))
@@ -686,23 +686,23 @@ static void drawArrow(const QStyle *style, const QStyleOptionToolButton *toolbut
 
 #ifndef QT_NO_ITEMVIEWS
 
-QSize QCommonStylePrivate::viewItemSize(const QStyleOptionViewItemV4 *option, int role) const
+QSize QCommonStylePrivate::viewItemSize(const QStyleOptionViewItem *option, int role) const
 {
     switch (role) {
     case Qt::CheckStateRole:
-        if (option->features & QStyleOptionViewItemV2::HasCheckIndicator)
+        if (option->features & QStyleOptionViewItem::HasCheckIndicator)
             return QSize(proxyStyle->pixelMetric(QStyle::PM_IndicatorWidth, option, option->widget),
                          proxyStyle->pixelMetric(QStyle::PM_IndicatorHeight, option, option->widget));
         break;
     case Qt::DisplayRole:
-        if (option->features & QStyleOptionViewItemV2::HasDisplay) {
+        if (option->features & QStyleOptionViewItem::HasDisplay) {
             QTextOption textOption;
             textOption.setWrapMode(QTextOption::WordWrap);
             QTextLayout textLayout;
             textLayout.setTextOption(textOption);
             textLayout.setFont(option->font);
             textLayout.setText(option->text);
-            const bool wrapText = option->features & QStyleOptionViewItemV2::WrapText;
+            const bool wrapText = option->features & QStyleOptionViewItem::WrapText;
             const int textMargin = proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, option, option->widget) + 1;
             QRect bounds = option->rect;
             switch (option->decorationPosition) {
@@ -738,7 +738,7 @@ QSize QCommonStylePrivate::viewItemSize(const QStyleOptionViewItemV4 *option, in
         }
         break;
     case Qt::DecorationRole:
-        if (option->features & QStyleOptionViewItemV2::HasDecoration) {
+        if (option->features & QStyleOptionViewItem::HasDecoration) {
             return option->decorationSize;
         }
         break;
@@ -768,12 +768,12 @@ static QSizeF viewItemTextLayout(QTextLayout &textLayout, int lineWidth)
 }
 
 
-void QCommonStylePrivate::viewItemDrawText(QPainter *p, const QStyleOptionViewItemV4 *option, const QRect &rect) const
+void QCommonStylePrivate::viewItemDrawText(QPainter *p, const QStyleOptionViewItem *option, const QRect &rect) const
 {
     const int textMargin = proxyStyle->pixelMetric(QStyle::PM_FocusFrameHMargin, 0, option->widget) + 1;
 
     QRect textRect = rect.adjusted(textMargin, 0, -textMargin, 0); // remove width padding
-    const bool wrapText = option->features & QStyleOptionViewItemV2::WrapText;
+    const bool wrapText = option->features & QStyleOptionViewItem::WrapText;
     QTextOption textOption;
     textOption.setWrapMode(wrapText ? QTextOption::WordWrap : QTextOption::NoWrap);
     textOption.setTextDirection(option->direction);
@@ -847,7 +847,7 @@ void QCommonStylePrivate::viewItemDrawText(QPainter *p, const QStyleOptionViewIt
 
     Code duplicated in QItemDelegate::doLayout
 */
-void QCommonStylePrivate::viewItemLayout(const QStyleOptionViewItemV4 *opt,  QRect *checkRect,
+void QCommonStylePrivate::viewItemLayout(const QStyleOptionViewItem *opt,  QRect *checkRect,
                                          QRect *pixmapRect, QRect *textRect, bool sizehint) const
 {
     Q_ASSERT(checkRect && pixmapRect && textRect);
@@ -1994,7 +1994,7 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
 
 #ifndef QT_NO_ITEMVIEWS
     case CE_ItemViewItem:
-        if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+        if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             p->save();
             p->setClipRect(opt->rect);
 
@@ -2006,8 +2006,8 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt,
             proxy()->drawPrimitive(PE_PanelItemViewItem, opt, p, widget);
 
             // draw the check mark
-            if (vopt->features & QStyleOptionViewItemV2::HasCheckIndicator) {
-                QStyleOptionViewItemV4 option(*vopt);
+            if (vopt->features & QStyleOptionViewItem::HasCheckIndicator) {
+                QStyleOptionViewItem option(*vopt);
                 option.rect = checkRect;
                 option.state = option.state & ~QStyle::State_HasFocus;
 
@@ -2824,21 +2824,21 @@ QRect QCommonStyle::subElementRect(SubElement sr, const QStyleOption *opt,
 #endif
 #ifndef QT_NO_ITEMVIEWS
     case SE_ItemViewItemCheckIndicator:
-        if (!qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+        if (!qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             r = subElementRect(SE_CheckBoxIndicator, opt, widget);
             break;
         }
     case SE_ItemViewItemDecoration:
     case SE_ItemViewItemText:
     case SE_ItemViewItemFocusRect:
-        if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+        if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             if (!d->isViewItemCached(*vopt)) {
                 d->viewItemLayout(vopt, &d->checkRect, &d->decorationRect, &d->displayRect, false);
                 if (d->cachedOption) {
                     delete d->cachedOption;
                     d->cachedOption = 0;
                 }
-                d->cachedOption = new QStyleOptionViewItemV4(*vopt);
+                d->cachedOption = new QStyleOptionViewItem(*vopt);
             }
             if (sr == SE_ItemViewItemCheckIndicator)
                 r = d->checkRect;
@@ -4480,7 +4480,7 @@ QSize QCommonStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt,
 #endif // QT_NO_GROUPBOX
 #ifndef QT_NO_ITEMVIEWS
     case CT_ItemViewItem:
-        if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+        if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             QRect decorationRect, displayRect, checkRect;
             d->viewItemLayout(vopt, &checkRect, &decorationRect, &displayRect, true);
             sz = (decorationRect|displayRect|checkRect).size();
diff --git a/src/gui/styles/qcommonstyle_p.h b/src/gui/styles/qcommonstyle_p.h
index e7e38618f..0b18788fd 100644
--- a/src/gui/styles/qcommonstyle_p.h
+++ b/src/gui/styles/qcommonstyle_p.h
@@ -58,14 +58,14 @@ public:
     {
         delete cachedOption;
     }
-    void viewItemDrawText(QPainter *p, const QStyleOptionViewItemV4 *option, const QRect &rect) const;
-    void viewItemLayout(const QStyleOptionViewItemV4 *opt,  QRect *checkRect,
+    void viewItemDrawText(QPainter *p, const QStyleOptionViewItem *option, const QRect &rect) const;
+    void viewItemLayout(const QStyleOptionViewItem *opt,  QRect *checkRect,
                         QRect *pixmapRect, QRect *textRect, bool sizehint) const;
-    QSize viewItemSize(const QStyleOptionViewItemV4 *option, int role) const;
+    QSize viewItemSize(const QStyleOptionViewItem *option, int role) const;
 
     mutable QRect decorationRect, displayRect, checkRect;
-    mutable QStyleOptionViewItemV4 *cachedOption;
-    bool isViewItemCached(const QStyleOptionViewItemV4 &option) const {
+    mutable QStyleOptionViewItem *cachedOption;
+    bool isViewItemCached(const QStyleOptionViewItem &option) const {
         return cachedOption && (option.rect == cachedOption->rect
                && option.direction == cachedOption->direction
                && option.state == cachedOption->state
diff --git a/src/gui/styles/qstyleoption.cpp b/src/gui/styles/qstyleoption.cpp
index 2118e10d4..9650dc37d 100644
--- a/src/gui/styles/qstyleoption.cpp
+++ b/src/gui/styles/qstyleoption.cpp
@@ -2859,27 +2859,6 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
     Programming}
 */
 
-/*!
-    \typedef QStyleOptionViewItemV2
-    \relates QStyleOptionViewItem
-
-    Synonym for QStyleOptionViewItem.
-*/
-
-/*!
-    \typedef QStyleOptionViewItemV3
-    \relates QStyleOptionViewItem
-
-    Synonym for QStyleOptionViewItem.
-*/
-
-/*!
-    \typedef QStyleOptionViewItemV4
-    \relates QStyleOptionViewItem
-
-    Synonym for QStyleOptionViewItem.
-*/
-
 /*!
     \enum QStyleOptionViewItem::Position
 
diff --git a/src/gui/styles/qstyleoption.h b/src/gui/styles/qstyleoption.h
index 5e28a282d..f4a3372a5 100644
--- a/src/gui/styles/qstyleoption.h
+++ b/src/gui/styles/qstyleoption.h
@@ -397,10 +397,6 @@ protected:
 };
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionViewItem::ViewItemFeatures)
-
-typedef QStyleOptionViewItem QStyleOptionViewItemV2;
-typedef QStyleOptionViewItem QStyleOptionViewItemV3;
-typedef QStyleOptionViewItem QStyleOptionViewItemV4;
 #endif // QT_NO_ITEMVIEWS
 
 class Q_GUI_EXPORT QStyleOptionToolBox : public QStyleOption
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index cd93b15aa..dec426166 100644
--- a/src/gui/styles/qstylesheetstyle.cpp
+++ b/src/gui/styles/qstylesheetstyle.cpp
@@ -1939,16 +1939,16 @@ QRenderRule QStyleSheetStyle::renderRule(const QWidget *w, const QStyleOption *o
         }
 #endif // QT_NO_DOCKWIDGET
 #ifndef QT_NO_ITEMVIEWS
-        else if (const QStyleOptionViewItemV2 *v2 = qstyleoption_cast<const QStyleOptionViewItemV2 *>(opt)) {
-            if (v2->features & QStyleOptionViewItemV2::Alternate)
+        else if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
+            if (vopt->features & QStyleOptionViewItem::Alternate)
                 extraClass |= PseudoClass_Alternate;
-            if (v2->viewItemPosition == QStyleOptionViewItemV4::OnlyOne)
+            if (vopt->viewItemPosition == QStyleOptionViewItem::OnlyOne)
                 extraClass |= PseudoClass_OnlyOne;
-            else if (v2->viewItemPosition == QStyleOptionViewItemV4::Beginning)
+            else if (vopt->viewItemPosition == QStyleOptionViewItem::Beginning)
                 extraClass |= PseudoClass_First;
-            else if (v2->viewItemPosition == QStyleOptionViewItemV4::End)
+            else if (vopt->viewItemPosition == QStyleOptionViewItem::End)
                 extraClass |= PseudoClass_Last;
-            else if (v2->viewItemPosition == QStyleOptionViewItemV4::Middle)
+            else if (vopt->viewItemPosition == QStyleOptionViewItem::Middle)
                 extraClass |= PseudoClass_Middle;
         }
 #endif
@@ -3869,15 +3869,15 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q
 
 #ifndef QT_NO_ITEMVIEWS
     case CE_ItemViewItem:
-        if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+        if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             QRenderRule subRule = renderRule(w, opt, PseudoElement_ViewItem);
             if (subRule.hasDrawable() || hasStyleRule(w, PseudoElement_Indicator)) {
-                QStyleOptionViewItemV4 optCopy(*vopt);
+                QStyleOptionViewItem optCopy(*vopt);
                 subRule.configurePalette(&optCopy.palette, vopt->state & QStyle::State_Selected ? QPalette::HighlightedText : QPalette::Text,
                                                            vopt->state & QStyle::State_Selected ? QPalette::Highlight : QPalette::Base);
                 QWindowsStyle::drawControl(ce, &optCopy, p, w);
             } else {
-                QStyleOptionViewItemV4 voptCopy(*vopt);
+                QStyleOptionViewItem voptCopy(*vopt);
                 subRule.configurePalette(&voptCopy.palette, QPalette::Text, QPalette::NoRole);
                 baseStyle()->drawControl(ce, &voptCopy, p, w);
             }
@@ -4248,16 +4248,16 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op
     }
 
     case PE_IndicatorBranch: {
-        if (const QStyleOptionViewItemV2 *v2 = qstyleoption_cast<const QStyleOptionViewItemV2 *>(opt)) {
+        if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             QRenderRule subRule = renderRule(w, opt, PseudoElement_TreeViewBranch);
             if (subRule.hasDrawable()) {
-                if ((v2->state & QStyle::State_Selected) && v2->showDecorationSelected)
-                    p->fillRect(v2->rect, v2->palette.highlight());
-                else if (v2->features & QStyleOptionViewItemV2::Alternate)
-                    p->fillRect(v2->rect, v2->palette.alternateBase());
+                if ((vopt->state & QStyle::State_Selected) && vopt->showDecorationSelected)
+                    p->fillRect(vopt->rect, vopt->palette.highlight());
+                else if (vopt->features & QStyleOptionViewItem::Alternate)
+                    p->fillRect(vopt->rect, vopt->palette.alternateBase());
                 subRule.drawRule(p, opt->rect);
             } else {
-                baseStyle()->drawPrimitive(pe, v2, p, w);
+                baseStyle()->drawPrimitive(pe, vopt, p, w);
             }
         }
         return;
@@ -5509,27 +5509,27 @@ QRect QStyleSheetStyle::subElementRect(SubElement se, const QStyleOption *opt, c
 
 #ifndef QT_NO_ITEMVIEWS
     case SE_ItemViewItemCheckIndicator:
-        if (!qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+        if (!qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             return subElementRect(SE_CheckBoxIndicator, opt, w);
         }
         // intentionally falls through
     case SE_ItemViewItemText:
     case SE_ItemViewItemDecoration:
     case SE_ItemViewItemFocusRect:
-        if (const QStyleOptionViewItemV4 *vopt = qstyleoption_cast<const QStyleOptionViewItemV4 *>(opt)) {
+        if (const QStyleOptionViewItem *vopt = qstyleoption_cast<const QStyleOptionViewItem *>(opt)) {
             QRenderRule subRule = renderRule(w, opt, PseudoElement_ViewItem);
             PseudoElement pe = PseudoElement_None;
             if (se == SE_ItemViewItemText || se == SE_ItemViewItemFocusRect)
                 pe = PseudoElement_ViewItemText;
-            else if (se == SE_ItemViewItemDecoration && vopt->features & QStyleOptionViewItemV2::HasDecoration)
+            else if (se == SE_ItemViewItemDecoration && vopt->features & QStyleOptionViewItem::HasDecoration)
                 pe = PseudoElement_ViewItemIcon;
-            else if (se == SE_ItemViewItemCheckIndicator && vopt->features & QStyleOptionViewItemV2::HasCheckIndicator)
+            else if (se == SE_ItemViewItemCheckIndicator && vopt->features & QStyleOptionViewItem::HasCheckIndicator)
                 pe = PseudoElement_ViewItemIndicator;
             else
                 break;
             if (subRule.hasGeometry() || subRule.hasBox() || !subRule.hasNativeBorder() || hasStyleRule(w, pe)) {
                 QRenderRule subRule2 = renderRule(w, opt, pe);
-                QStyleOptionViewItemV4 optCopy(*vopt);
+                QStyleOptionViewItem optCopy(*vopt);
                 optCopy.rect = subRule.contentsRect(vopt->rect);
                 QRect rect = ParentStyle::subElementRect(se, &optCopy, w);
                 return positionRect(w, subRule2, pe, rect, opt->direction);
diff --git a/src/gui/widgets/qcalendarwidget.cpp b/src/gui/widgets/qcalendarwidget.cpp
index 09bbc5b0f..8c7a8a16c 100644
--- a/src/gui/widgets/qcalendarwidget.cpp
+++ b/src/gui/widgets/qcalendarwidget.cpp
@@ -1452,7 +1452,7 @@ public:
 
 private:
     QCalendarWidgetPrivate *calendarWidgetPrivate;
-    mutable QStyleOptionViewItemV4 storedOption;
+    mutable QStyleOptionViewItem storedOption;
 };
 
 //Private tool button class
diff --git a/tests/auto/qlistview/tst_qlistview.cpp b/tests/auto/qlistview/tst_qlistview.cpp
index 93a70d1b5..2825818d7 100644
--- a/tests/auto/qlistview/tst_qlistview.cpp
+++ b/tests/auto/qlistview/tst_qlistview.cpp
@@ -1884,8 +1884,7 @@ void tst_QListView::styleOptionViewItem()
         public:
             void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const
             {
-                QVERIFY(qstyleoption_cast<const QStyleOptionViewItemV4 *>(&option));
-                QStyleOptionViewItemV4 opt(option);
+                QStyleOptionViewItem opt(option);
                 initStyleOption(&opt, index);
 
                 QCOMPARE(opt.index, index);
diff --git a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
index 1179de096..37400e491 100644
--- a/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
+++ b/tests/auto/qstylesheetstyle/tst_qstylesheetstyle.cpp
@@ -1202,9 +1202,9 @@ void tst_QStyleSheetStyle::proxyStyle()
     QTest::qWait(100);
 
     // Test for QTBUG-7198 - style sheet overrides custom element size
-    QStyleOptionViewItemV4 opt;
+    QStyleOptionViewItem opt;
     opt.initFrom(w);
-    opt.features |= QStyleOptionViewItemV2::HasCheckIndicator;
+    opt.features |= QStyleOptionViewItem::HasCheckIndicator;
     QVERIFY(pb5->style()->subElementRect(QStyle::SE_ItemViewItemCheckIndicator,
             &opt, pb5).width() == 3);
     delete w;