diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:12:21 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-03-28 08:12:21 +0200 |
| commit | 794781e7cff9f7d44af64292796428478ed18663 (patch) | |
| tree | dae1f8478885d95dac5766ce46d5dd4784ca06f4 /src/corelib/itemmodels/qstringlistmodel.h | |
| parent | f69d32b535d456a2441754ef5733c7fb65411d6c (diff) | |
| parent | e83f1900f657a41036bd16e917527fcb7a52fd2b (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Conflicts:
src/plugins/platforms/cocoa/qnsview.mm
src/plugins/platforms/cocoa/qnsview_mouse.mm
src/testlib/testlib.pro
Change-Id: Ia0ce4243418fe6a485b0f290c67bd433b3b04ff2
Diffstat (limited to 'src/corelib/itemmodels/qstringlistmodel.h')
| -rw-r--r-- | src/corelib/itemmodels/qstringlistmodel.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/corelib/itemmodels/qstringlistmodel.h b/src/corelib/itemmodels/qstringlistmodel.h index 38da1022ea..a40c13ae40 100644 --- a/src/corelib/itemmodels/qstringlistmodel.h +++ b/src/corelib/itemmodels/qstringlistmodel.h @@ -43,10 +43,9 @@ #include <QtCore/qabstractitemmodel.h> #include <QtCore/qstringlist.h> -QT_BEGIN_NAMESPACE - +QT_REQUIRE_CONFIG(stringlistmodel); -#ifndef QT_NO_STRINGLISTMODEL +QT_BEGIN_NAMESPACE class Q_CORE_EXPORT QStringListModel : public QAbstractListModel { @@ -78,8 +77,6 @@ private: QStringList lst; }; -#endif // QT_NO_STRINGLISTMODEL - QT_END_NAMESPACE #endif // QSTRINGLISTMODEL_H |