Compile with -no-feature-itemviews
Change-Id: I23506f06df35f124f5eb9fcc8426c63b407a0872 Reviewed-by: Lars Knoll <lars.knoll@qt.io>bb10
parent
6d06d4b07c
commit
eae92384b0
|
|
@ -504,7 +504,7 @@
|
|||
"label": "QCompleter",
|
||||
"purpose": "Provides completions based on an item model.",
|
||||
"section": "Utilities",
|
||||
"condition": "features.proxymodel",
|
||||
"condition": "features.proxymodel && features.itemviews",
|
||||
"output": [ "publicFeature", "feature" ]
|
||||
},
|
||||
"fscompleter": {
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
# Qt gui library, itemviews
|
||||
|
||||
qtConfig(itemviews) {
|
||||
HEADERS += \
|
||||
itemviews/qabstractitemview.h \
|
||||
itemviews/qabstractitemview_p.h \
|
||||
|
|
@ -27,8 +28,6 @@ HEADERS += \
|
|||
itemviews/qitemeditorfactory_p.h \
|
||||
itemviews/qtreewidgetitemiterator.h \
|
||||
itemviews/qdatawidgetmapper.h \
|
||||
itemviews/qfileiconprovider.h \
|
||||
itemviews/qfileiconprovider_p.h \
|
||||
itemviews/qcolumnviewgrip_p.h \
|
||||
itemviews/qcolumnview.h \
|
||||
itemviews/qcolumnview_p.h \
|
||||
|
|
@ -50,8 +49,14 @@ SOURCES += \
|
|||
itemviews/qitemeditorfactory.cpp \
|
||||
itemviews/qtreewidgetitemiterator.cpp \
|
||||
itemviews/qdatawidgetmapper.cpp \
|
||||
itemviews/qfileiconprovider.cpp \
|
||||
itemviews/qcolumnview.cpp \
|
||||
itemviews/qcolumnviewgrip.cpp \
|
||||
itemviews/qstyleditemdelegate.cpp
|
||||
}
|
||||
|
||||
HEADERS += \
|
||||
itemviews/qfileiconprovider.h \
|
||||
itemviews/qfileiconprovider_p.h \
|
||||
|
||||
SOURCES += \
|
||||
itemviews/qfileiconprovider.cpp
|
||||
|
|
|
|||
|
|
@ -473,6 +473,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
|
|||
// move the scrollbars away from top/left headers
|
||||
int vHeaderRight = 0;
|
||||
int hHeaderBottom = 0;
|
||||
#if QT_CONFIG(itemviews)
|
||||
if ((vscrollOverlap > 0 && needv) || (hscrollOverlap > 0 && needh)) {
|
||||
const QList<QHeaderView *> headers = q->findChildren<QHeaderView*>();
|
||||
if (headers.count() <= 2) {
|
||||
|
|
@ -485,7 +486,7 @@ void QAbstractScrollAreaPrivate::layoutChildren()
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif // QT_CONFIG(itemviews)
|
||||
if (needh) {
|
||||
QRect horizontalScrollBarRect(QPoint(controlsRect.left() + vHeaderRight, cornerPoint.y()), QPoint(cornerPoint.x() - 1, controlsRect.bottom()));
|
||||
#if 0 // Used to be included in Qt4 for Q_WS_MAC
|
||||
|
|
|
|||
Loading…
Reference in New Issue