diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-06-09 00:34:04 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-06-09 00:34:04 (GMT) |
| commit | b8c8c87587bcc0312f0efbb2028885adb8419fee (patch) | |
| tree | 4857b4ff79acb48953c9a2a7c3a62c6dfeafdda3 /src/gui/itemviews/qlistwidget.cpp | |
| parent | 9410eb0630e0f3b80ffd335002efbd7ce532e826 (diff) | |
| parent | 70283a0a87e46a8aa9d2e6296f4ed7c93cc230d6 (diff) | |
| download | Qt-b8c8c87587bcc0312f0efbb2028885adb8419fee.zip Qt-b8c8c87587bcc0312f0efbb2028885adb8419fee.tar.gz Qt-b8c8c87587bcc0312f0efbb2028885adb8419fee.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure.exe
tools/qdoc3/htmlgenerator.cpp
tools/qdoc3/tree.cpp
Diffstat (limited to 'src/gui/itemviews/qlistwidget.cpp')
| -rw-r--r-- | src/gui/itemviews/qlistwidget.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/itemviews/qlistwidget.cpp b/src/gui/itemviews/qlistwidget.cpp index bf3b43c..e1e509d 100644 --- a/src/gui/itemviews/qlistwidget.cpp +++ b/src/gui/itemviews/qlistwidget.cpp @@ -711,6 +711,7 @@ void QListWidgetItem::write(QDataStream &out) const { out << d->values; } +#endif // QT_NO_DATASTREAM /*! \since 4.1 @@ -745,6 +746,8 @@ QListWidgetItem &QListWidgetItem::operator=(const QListWidgetItem &other) return *this; } +#ifndef QT_NO_DATASTREAM + /*! \relates QListWidgetItem |