diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-06-03 14:31:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2016-07-14 13:46:07 +0000 |
| commit | 8fc1cd085cabba911cb4b18e91fbe158db13a2a8 (patch) | |
| tree | 8cb77a0bd11da59358aae2028f1aa1e740db8600 /src/widgets/itemviews | |
| parent | 64507c7165e42c2a5029353d8f97a0d841fa6b01 (diff) | |
Add qtwidgetsglobal.h and qtwidgetsglobal_p.h
The new modular configuration system requires one global
header per module, that is included by all other files in
this module.
That header will later on #include the configuration file
for Qt Widgets. For now it defines the Q_WIDGETS_EXPORT
macro for this library.
Change-Id: I6698989b952b9bac94d086d9f219e03c000f7d53
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'src/widgets/itemviews')
32 files changed, 32 insertions, 2 deletions
diff --git a/src/widgets/itemviews/qabstractitemdelegate.h b/src/widgets/itemviews/qabstractitemdelegate.h index 9fe72655ab..9f7a7716af 100644 --- a/src/widgets/itemviews/qabstractitemdelegate.h +++ b/src/widgets/itemviews/qabstractitemdelegate.h @@ -40,6 +40,7 @@ #ifndef QABSTRACTITEMDELEGATE_H #define QABSTRACTITEMDELEGATE_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qobject.h> #include <QtWidgets/qstyleoption.h> diff --git a/src/widgets/itemviews/qabstractitemdelegate_p.h b/src/widgets/itemviews/qabstractitemdelegate_p.h index 2fd38bdfd7..04d929a0ac 100644 --- a/src/widgets/itemviews/qabstractitemdelegate_p.h +++ b/src/widgets/itemviews/qabstractitemdelegate_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qabstractitemdelegate.h" #include <private/qobject_p.h> diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index b8d386f234..b080f84e90 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -40,6 +40,7 @@ #ifndef QABSTRACTITEMVIEW_H #define QABSTRACTITEMVIEW_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractscrollarea.h> #include <QtCore/qabstractitemmodel.h> #include <QtCore/qitemselectionmodel.h> diff --git a/src/widgets/itemviews/qabstractitemview_p.h b/src/widgets/itemviews/qabstractitemview_p.h index 60ae1559b1..3877969f87 100644 --- a/src/widgets/itemviews/qabstractitemview_p.h +++ b/src/widgets/itemviews/qabstractitemview_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractscrollarea_p.h" #include "private/qabstractitemmodel_p.h" #include "QtWidgets/qapplication.h" diff --git a/src/widgets/itemviews/qbsptree_p.h b/src/widgets/itemviews/qbsptree_p.h index 4e57297296..5fd7a5c45f 100644 --- a/src/widgets/itemviews/qbsptree_p.h +++ b/src/widgets/itemviews/qbsptree_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <qvector.h> #include <qrect.h> diff --git a/src/widgets/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h index 1cf6acc405..7d5e2f5cd1 100644 --- a/src/widgets/itemviews/qcolumnview.h +++ b/src/widgets/itemviews/qcolumnview.h @@ -40,6 +40,7 @@ #ifndef QCOLUMNVIEW_H #define QCOLUMNVIEW_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractitemview.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h index 73d3e440d5..7eff0f66cd 100644 --- a/src/widgets/itemviews/qcolumnview_p.h +++ b/src/widgets/itemviews/qcolumnview_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qcolumnview.h" #ifndef QT_NO_QCOLUMNVIEW diff --git a/src/widgets/itemviews/qcolumnviewgrip_p.h b/src/widgets/itemviews/qcolumnviewgrip_p.h index 8c82486968..3447f9f824 100644 --- a/src/widgets/itemviews/qcolumnviewgrip_p.h +++ b/src/widgets/itemviews/qcolumnviewgrip_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <private/qwidget_p.h> #ifndef QT_NO_QCOLUMNVIEW diff --git a/src/widgets/itemviews/qdatawidgetmapper.h b/src/widgets/itemviews/qdatawidgetmapper.h index e7e4bc7210..4d244349ad 100644 --- a/src/widgets/itemviews/qdatawidgetmapper.h +++ b/src/widgets/itemviews/qdatawidgetmapper.h @@ -40,6 +40,7 @@ #ifndef QDATAWIDGETMAPPER_H #define QDATAWIDGETMAPPER_H +#include <QtWidgets/qtwidgetsglobal.h> #include "QtCore/qobject.h" #ifndef QT_NO_DATAWIDGETMAPPER diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index 7b4b859e0e..90a9809986 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -40,6 +40,7 @@ #ifndef QDIRMODEL_H #define QDIRMODEL_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qabstractitemmodel.h> #include <QtCore/qdir.h> #include <QtWidgets/qfileiconprovider.h> diff --git a/src/widgets/itemviews/qfileiconprovider.h b/src/widgets/itemviews/qfileiconprovider.h index e4c8c0d23e..732ca1ac8e 100644 --- a/src/widgets/itemviews/qfileiconprovider.h +++ b/src/widgets/itemviews/qfileiconprovider.h @@ -40,6 +40,7 @@ #ifndef QFILEICONPROVIDER_H #define QFILEICONPROVIDER_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qfileinfo.h> #include <QtCore/qscopedpointer.h> #include <QtGui/qicon.h> diff --git a/src/widgets/itemviews/qfileiconprovider_p.h b/src/widgets/itemviews/qfileiconprovider_p.h index 1cf7f947ad..4726b15816 100644 --- a/src/widgets/itemviews/qfileiconprovider_p.h +++ b/src/widgets/itemviews/qfileiconprovider_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "qfileiconprovider.h" #include <QtCore/qstring.h> diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index c2e3a1f05e..4be97c0c7e 100644 --- a/src/widgets/itemviews/qheaderview.h +++ b/src/widgets/itemviews/qheaderview.h @@ -40,6 +40,7 @@ #ifndef QHEADERVIEW_H #define QHEADERVIEW_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractitemview.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qheaderview_p.h b/src/widgets/itemviews/qheaderview_p.h index bbef2127a6..0356d79ff7 100644 --- a/src/widgets/itemviews/qheaderview_p.h +++ b/src/widgets/itemviews/qheaderview_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractitemview_p.h" #ifndef QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index e02da15f5e..3d98419c80 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -40,6 +40,7 @@ #ifndef QITEMDELEGATE_H #define QITEMDELEGATE_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractitemdelegate.h> #include <QtCore/qstring.h> #include <QtGui/qpixmap.h> diff --git a/src/widgets/itemviews/qitemeditorfactory.h b/src/widgets/itemviews/qitemeditorfactory.h index b5f8fa2354..785d4d84ea 100644 --- a/src/widgets/itemviews/qitemeditorfactory.h +++ b/src/widgets/itemviews/qitemeditorfactory.h @@ -40,6 +40,7 @@ #ifndef QITEMEDITORFACTORY_H #define QITEMEDITORFACTORY_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qmetaobject.h> #include <QtCore/qbytearray.h> #include <QtCore/qhash.h> diff --git a/src/widgets/itemviews/qitemeditorfactory_p.h b/src/widgets/itemviews/qitemeditorfactory_p.h index 3b080c3a44..91edcf65ba 100644 --- a/src/widgets/itemviews/qitemeditorfactory_p.h +++ b/src/widgets/itemviews/qitemeditorfactory_p.h @@ -52,7 +52,7 @@ // - +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <qlineedit.h> #ifndef QT_NO_ITEMVIEWS diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h index f44cf90616..e918e66d38 100644 --- a/src/widgets/itemviews/qlistview.h +++ b/src/widgets/itemviews/qlistview.h @@ -40,6 +40,7 @@ #ifndef QLISTVIEW_H #define QLISTVIEW_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractitemview.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qlistview_p.h b/src/widgets/itemviews/qlistview_p.h index 90fb9e1407..42cb6b4eef 100644 --- a/src/widgets/itemviews/qlistview_p.h +++ b/src/widgets/itemviews/qlistview_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractitemview_p.h" #include "qrubberband.h" #include "qbitarray.h" diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 06e2469398..c70e0522b7 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -40,6 +40,7 @@ #ifndef QLISTWIDGET_H #define QLISTWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qlistview.h> #include <QtCore/qvariant.h> #include <QtCore/qvector.h> diff --git a/src/widgets/itemviews/qlistwidget_p.h b/src/widgets/itemviews/qlistwidget_p.h index bb0c35db5f..eaddfc6e6e 100644 --- a/src/widgets/itemviews/qlistwidget_p.h +++ b/src/widgets/itemviews/qlistwidget_p.h @@ -50,6 +50,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/qabstractitemmodel.h> #include <QtWidgets/qabstractitemview.h> #include <QtWidgets/qlistwidget.h> diff --git a/src/widgets/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h index bf011cdf10..d30e6e0e9c 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.h +++ b/src/widgets/itemviews/qstyleditemdelegate.h @@ -40,6 +40,7 @@ #ifndef QSTYLEDITEMDELEGATE_H #define QSTYLEDITEMDELEGATE_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractitemdelegate.h> #include <QtCore/qstring.h> #include <QtGui/qpixmap.h> diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index 5ab05b91bf..8c9ac379bc 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -40,6 +40,7 @@ #ifndef QTABLEVIEW_H #define QTABLEVIEW_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractitemview.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qtableview_p.h b/src/widgets/itemviews/qtableview_p.h index 617ecb1642..2ca158d657 100644 --- a/src/widgets/itemviews/qtableview_p.h +++ b/src/widgets/itemviews/qtableview_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/QList> #include <QtCore/QLinkedList> #include <QtCore/QMap> diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index 91249e47ee..5dde93f628 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -40,6 +40,7 @@ #ifndef QTABLEWIDGET_H #define QTABLEWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qtableview.h> #include <QtCore/qvariant.h> #include <QtCore/qvector.h> diff --git a/src/widgets/itemviews/qtablewidget_p.h b/src/widgets/itemviews/qtablewidget_p.h index d3a2f02205..313577befe 100644 --- a/src/widgets/itemviews/qtablewidget_p.h +++ b/src/widgets/itemviews/qtablewidget_p.h @@ -50,6 +50,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <qheaderview.h> #include <qtablewidget.h> #include <qabstractitemmodel.h> diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index 6fd6799b7e..b3a88db005 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -40,6 +40,7 @@ #ifndef QTREEVIEW_H #define QTREEVIEW_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qabstractitemview.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qtreeview_p.h b/src/widgets/itemviews/qtreeview_p.h index a3619ce13b..56f3340966 100644 --- a/src/widgets/itemviews/qtreeview_p.h +++ b/src/widgets/itemviews/qtreeview_p.h @@ -51,6 +51,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include "private/qabstractitemview_p.h" #include <QtCore/qvariantanimation.h> #include <QtCore/qabstractitemmodel.h> diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index e360d62c5f..36ba9985bd 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -40,6 +40,7 @@ #ifndef QTREEWIDGET_H #define QTREEWIDGET_H +#include <QtWidgets/qtwidgetsglobal.h> #include <QtWidgets/qtreeview.h> #include <QtWidgets/qtreewidgetitemiterator.h> #include <QtCore/qvariant.h> diff --git a/src/widgets/itemviews/qtreewidget_p.h b/src/widgets/itemviews/qtreewidget_p.h index 7e7e8e9e35..7789693db4 100644 --- a/src/widgets/itemviews/qtreewidget_p.h +++ b/src/widgets/itemviews/qtreewidget_p.h @@ -50,6 +50,7 @@ // We mean it. // +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/qabstractitemmodel.h> #include <private/qabstractitemmodel_p.h> #include <QtCore/qpair.h> diff --git a/src/widgets/itemviews/qtreewidgetitemiterator.h b/src/widgets/itemviews/qtreewidgetitemiterator.h index 2cdf03fd7a..db17a96abd 100644 --- a/src/widgets/itemviews/qtreewidgetitemiterator.h +++ b/src/widgets/itemviews/qtreewidgetitemiterator.h @@ -40,7 +40,7 @@ #ifndef QTREEWIDGETITEMITERATOR_H #define QTREEWIDGETITEMITERATOR_H -#include <QtCore/qglobal.h> +#include <QtWidgets/qtwidgetsglobal.h> #include <QtCore/qscopedpointer.h> QT_BEGIN_NAMESPACE diff --git a/src/widgets/itemviews/qwidgetitemdata_p.h b/src/widgets/itemviews/qwidgetitemdata_p.h index 6c100553ba..b7ed6ed862 100644 --- a/src/widgets/itemviews/qwidgetitemdata_p.h +++ b/src/widgets/itemviews/qwidgetitemdata_p.h @@ -40,6 +40,7 @@ #ifndef QWIDGETITEMDATA_P_H #define QWIDGETITEMDATA_P_H +#include <QtWidgets/private/qtwidgetsglobal_p.h> #include <QtCore/qdatastream.h> // |