diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-19 09:47:29 +0200 |
| commit | 407302fb1b823fbe0ae09c031862f87b252489e6 (patch) | |
| tree | f192faf40b9009ee6a884ed4b7d0b3942b6810ac /src/widgets/itemviews/itemviews.pri | |
| parent | 0f30dcaea8129092142fe87d2d14209c75363f66 (diff) | |
| parent | ad3b41a06d9ba7219c79b5548c5b11698787288d (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/corelib/io/qwindowspipewriter.cpp
src/widgets/styles/qcommonstyle.cpp
Change-Id: I0d33efdc4dc256e234abc490a18ccda72cd1d9e6
Diffstat (limited to 'src/widgets/itemviews/itemviews.pri')
| -rw-r--r-- | src/widgets/itemviews/itemviews.pri | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/widgets/itemviews/itemviews.pri b/src/widgets/itemviews/itemviews.pri index 4101be5631..c68aa590bc 100644 --- a/src/widgets/itemviews/itemviews.pri +++ b/src/widgets/itemviews/itemviews.pri @@ -9,8 +9,6 @@ HEADERS += \ itemviews/qlistview.h \ itemviews/qlistview_p.h \ itemviews/qbsptree_p.h \ - itemviews/qtreeview.h \ - itemviews/qtreeview_p.h \ itemviews/qabstractitemdelegate.h \ itemviews/qabstractitemdelegate_p.h \ itemviews/qitemdelegate.h \ @@ -26,7 +24,6 @@ SOURCES += \ itemviews/qheaderview.cpp \ itemviews/qlistview.cpp \ itemviews/qbsptree.cpp \ - itemviews/qtreeview.cpp \ itemviews/qabstractitemdelegate.cpp \ itemviews/qitemdelegate.cpp \ itemviews/qdirmodel.cpp \ @@ -70,6 +67,14 @@ qtConfig(tablewidget) { SOURCES += itemviews/qtablewidget.cpp } +qtConfig(treeview) { + HEADERS += \ + itemviews/qtreeview.h \ + itemviews/qtreeview_p.h + + SOURCES += itemviews/qtreeview.cpp +} + qtConfig(treewidget) { HEADERS += \ itemviews/qtreewidget.h \ |