From dd74f5d347d0a5a21527142f85114374e2d90646 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Fri, 9 Feb 2018 15:21:04 +0100
Subject: 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>
---
 src/gui/itemmodels/qstandarditemmodel_p.h | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/gui/itemmodels/qstandarditemmodel_p.h')

diff --git a/src/gui/itemmodels/qstandarditemmodel_p.h b/src/gui/itemmodels/qstandarditemmodel_p.h
index bd28ec3029..d3ff2787a5 100644
--- a/src/gui/itemmodels/qstandarditemmodel_p.h
+++ b/src/gui/itemmodels/qstandarditemmodel_p.h
@@ -54,8 +54,6 @@
 #include <QtGui/private/qtguiglobal_p.h>
 #include "private/qabstractitemmodel_p.h"
 
-#ifndef QT_NO_STANDARDITEMMODEL
-
 #include <QtCore/qlist.h>
 #include <QtCore/qpair.h>
 #include <QtCore/qstack.h>
@@ -63,6 +61,8 @@
 #include <QtCore/qvector.h>
 #include <QtCore/qdebug.h>
 
+QT_REQUIRE_CONFIG(standarditemmodel);
+
 QT_BEGIN_NAMESPACE
 
 class QStandardItemData
@@ -224,6 +224,4 @@ public:
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_STANDARDITEMMODEL
-
 #endif // QSTANDARDITEMMODEL_P_H
-- 
cgit v1.2.3