diff options
| author | Alexis Menard <alexis.menard@nokia.com> | 2009-06-09 09:41:38 (GMT) |
|---|---|---|
| committer | Alexis Menard <alexis.menard@nokia.com> | 2009-06-09 09:41:38 (GMT) |
| commit | bc3abd32ed1c5a872d7a7817c1af0a13f442d536 (patch) | |
| tree | 37d617a7baf54844bb4c396628b867ecb3b0b29e /src/gui/itemviews/qstandarditemmodel.cpp | |
| parent | 6d25d222b2bb418139e123b59366db908ee3188a (diff) | |
| parent | 91ceb21d1d5f6447a47853b6625fb51d2f21cf16 (diff) | |
| download | Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.zip Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.tar.gz Qt-bc3abd32ed1c5a872d7a7817c1af0a13f442d536.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into qt-main/qgraphicssceneindex
Diffstat (limited to 'src/gui/itemviews/qstandarditemmodel.cpp')
| -rw-r--r-- | src/gui/itemviews/qstandarditemmodel.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qstandarditemmodel.cpp b/src/gui/itemviews/qstandarditemmodel.cpp index 10aac9a..d8adbd2 100644 --- a/src/gui/itemviews/qstandarditemmodel.cpp +++ b/src/gui/itemviews/qstandarditemmodel.cpp @@ -1938,7 +1938,7 @@ QDataStream &operator<<(QDataStream &out, const QStandardItem &item) return out; } -#endif // !QT_NO_DATASTREAM +#endif // QT_NO_DATASTREAM /*! \class QStandardItemModel |