diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 13:55:40 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-07-06 14:08:02 +0200 |
| commit | 314fdbce8ce473eb3610be3658c61fab2fac0efb (patch) | |
| tree | 98a24a6f53ea8d6a7f3fc6ad60ab84dd66ae2863 /src/corelib/tools/qstringlist.cpp | |
| parent | 8d7647e286e07690de15a6ff9189307ee1a3517c (diff) | |
| parent | 83736a8d06a6ca2a1f165d6119ddaca90646e1f8 (diff) | |
Merge remote branch 'gerrit/master' into refactor
Conflicts:
config.tests/unix/opengldesktop/opengldesktop.cpp
examples/itemviews/interview/interview.pro
examples/mainwindows/mainwindow/mainwindow.pro
examples/openvg/README
examples/richtext/textedit/textedit.pro
examples/tools/undo/undo.pro
src/corelib/global/qglobal.h
src/corelib/kernel/qcoreapplication.h
src/corelib/kernel/qcoreevent.h
src/corelib/kernel/qmetatype.h
src/gui/kernel/qevent.cpp
src/gui/kernel/qevent.h
src/gui/painting/qpaintengine_raster.cpp
src/gui/painting/qpaintengine_raster_p.h
src/gui/text/qfontdatabase.cpp
src/opengl/qgl.h
src/openvg/qpaintengine_vg.cpp
src/plugins/platforms/wayland/qwaylandwindow.cpp
tests/auto/qmainwindow/qmainwindow.pro
Change-Id: I6bfb586740a68379bb99f4612ec993393a5f3234
Diffstat (limited to 'src/corelib/tools/qstringlist.cpp')
| -rw-r--r-- | src/corelib/tools/qstringlist.cpp | 36 |
1 files changed, 0 insertions, 36 deletions
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp index 8b47137fd8..44cc692b2f 100644 --- a/src/corelib/tools/qstringlist.cpp +++ b/src/corelib/tools/qstringlist.cpp @@ -234,42 +234,6 @@ void QtPrivate::QStringList_sort(QStringList *that) } -#ifdef QT3_SUPPORT -/*! - \fn QStringList QStringList::split(const QChar &sep, const QString &str, bool allowEmptyEntries) - - \overload - - This version of the function uses a QChar as separator. - - \sa join() QString::section() -*/ - -/*! - \fn QStringList QStringList::split(const QString &sep, const QString &str, bool allowEmptyEntries) - - \overload - - This version of the function uses a QString as separator. - - \sa join() QString::section() -*/ -#ifndef QT_NO_REGEXP -/*! - \fn QStringList QStringList::split(const QRegExp &sep, const QString &str, bool allowEmptyEntries) - - Use QString::split(\a sep, QString::SkipEmptyParts) or - QString::split(\a sep, QString::KeepEmptyParts) instead. - - Be aware that the QString::split()'s return value is a - QStringList that always contains at least one element, even if \a - str is empty. - - \sa join() QString::section() -*/ -#endif -#endif // QT3_SUPPORT - /*! \fn QStringList QStringList::filter(const QString &str, Qt::CaseSensitivity cs) const |