diff options
| author | David Boddie <david.boddie@nokia.com> | 2011-05-06 15:08:45 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2011-05-06 15:08:45 (GMT) |
| commit | 6bc6003cb2a2bb770d4e060653f18c05d8f4296b (patch) | |
| tree | 44cddd871e6cac48345a04bb900addf9626b5e8b /src/corelib/tools | |
| parent | bb4e1cefdf4d8302d89914e54e6ff7e2fc9481e8 (diff) | |
| download | Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.zip Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.tar.gz Qt-6bc6003cb2a2bb770d4e060653f18c05d8f4296b.tar.bz2 | |
Squashed merge of the master-temp branch.
Conflicts:
doc/src/examples/maemovibration.qdoc
Diffstat (limited to 'src/corelib/tools')
| -rw-r--r-- | src/corelib/tools/qlist.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qscopedvaluerollback.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/tools/qlist.cpp b/src/corelib/tools/qlist.cpp index 1501daf..747e756 100644 --- a/src/corelib/tools/qlist.cpp +++ b/src/corelib/tools/qlist.cpp @@ -590,10 +590,10 @@ void **QListData::erase(void **xi) \sa operator=() */ -/*! \fn QList::QList(std::initializer_list<T> args) +/*! \fn inline QList::QList(std::initializer_list<T> args) \since 4.8 - Construct a list from a std::initilizer_list. + Construct a list from the std::initializer_list specified by \a args. This constructor is only enabled if the compiler supports C++0x */ diff --git a/src/corelib/tools/qscopedvaluerollback.cpp b/src/corelib/tools/qscopedvaluerollback.cpp index 8933efc..c9c83b8 100644 --- a/src/corelib/tools/qscopedvaluerollback.cpp +++ b/src/corelib/tools/qscopedvaluerollback.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE /*! \class QScopedValueRollback - \brief The QScopedValueRollback resets a variable to its previous value on destruction + \brief The QScopedValueRollback class resets a variable to its previous value on destruction. \since 4.8 \ingroup misc |