diff options
| author | Ulf Hermann <ulf.hermann@qt.io> | 2018-02-09 15:21:04 +0100 |
|---|---|---|
| committer | Ulf Hermann <ulf.hermann@qt.io> | 2018-03-20 08:19:03 +0000 |
| commit | dd74f5d347d0a5a21527142f85114374e2d90646 (patch) | |
| tree | a6d86134261a156e28631677e64f0bdf59c99d20 /src/gui/itemmodels/qstandarditemmodel.h | |
| parent | f4b6ea2ae2619bd4f7f7ef2d5255341d8da5726f (diff) | |
Gui: Properly use the standarditemmodel feature
Require it in the headers and exclude the implementation from the build
if disabled.
Change-Id: Ida3303f8595f47b469e92d68e8bccc3957d943b6
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'src/gui/itemmodels/qstandarditemmodel.h')
| -rw-r--r-- | src/gui/itemmodels/qstandarditemmodel.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h index d8f06b629a..d1c04d6b51 100644 --- a/src/gui/itemmodels/qstandarditemmodel.h +++ b/src/gui/itemmodels/qstandarditemmodel.h @@ -49,10 +49,9 @@ #include <QtCore/qdatastream.h> #endif -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(standarditemmodel); -#ifndef QT_NO_STANDARDITEMMODEL +QT_BEGIN_NAMESPACE template <class T> class QList; @@ -454,8 +453,6 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &in, QStandardItem &item); Q_GUI_EXPORT QDataStream &operator<<(QDataStream &out, const QStandardItem &item); #endif -#endif // QT_NO_STANDARDITEMMODEL - QT_END_NAMESPACE #endif //QSTANDARDITEMMODEL_H |