diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 07:10:47 +0200 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-04 07:10:47 +0200 |
| commit | a7c28a59d0a20522555c38ec61533fcc7b61c2b3 (patch) | |
| tree | 192359b44153bde8e0e58eb6e4c29e4324324243 /src/corelib | |
| parent | 8cbc34de67d52d5923b3a70bf84aadfe3aa94f24 (diff) | |
| parent | bf10dbd2f3e5be3464ad26ebe64230bb61ca994f (diff) | |
| download | qt4-tools-a7c28a59d0a20522555c38ec61533fcc7b61c2b3.tar.gz | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QWorkspace: fix hardcoded min size overwriting the real min size
Setting the _NET_WM_STATE Atom only when its not already set
Fix focus appearance of tabwidget tabs with QGtkStyle
Incorrect selection background for unfocused widgets with GTK
Make the OpenSSL library search also hit /lib.
Update change log.
Fix a link that no longer exists in documentation.
Remove obsolete reference to qregexp.tex.
Reference to QStringList::find() is incorrect, should be QStringList::filter().
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 2 | ||||
| -rw-r--r-- | src/corelib/tools/qregexp.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/tools/qstring.cpp | 2 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index 5cd7f0e35d..87af61aef3 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -2767,7 +2767,7 @@ \value ElideNone Ellipsis should NOT appear in the text. Qt::ElideMiddle is normally the most appropriate choice for URLs (e.g., - "\l{http://qt.nokia.com/careers/movingto/brisbane/}{http://qt.nok...ovingto/brisbane/}"), + "\l{http://bugreports.qt.nokia.com/browse/QTWEBSITE-13}{http://bugreports.qt.../QTWEBSITE-13/}"), whereas Qt::ElideRight is appropriate for other strings (e.g., "\l{http://qt.nokia.com/doc/qq/qq09-mac-deployment.html}{Deploying Applications on Ma...}"). diff --git a/src/corelib/tools/qregexp.cpp b/src/corelib/tools/qregexp.cpp index 36827d056b..a8bf38fc2c 100644 --- a/src/corelib/tools/qregexp.cpp +++ b/src/corelib/tools/qregexp.cpp @@ -74,10 +74,6 @@ int qFindString(const QChar *haystack, int haystackLen, int from, #define RXERR_INTERVAL QT_TRANSLATE_NOOP("QRegExp", "invalid interval") #define RXERR_CATEGORY QT_TRANSLATE_NOOP("QRegExp", "invalid category") -/* - WARNING! Be sure to read qregexp.tex before modifying this file. -*/ - /*! \class QRegExp \reentrant diff --git a/src/corelib/tools/qstring.cpp b/src/corelib/tools/qstring.cpp index 5be885b4fd..dba53afaa2 100644 --- a/src/corelib/tools/qstring.cpp +++ b/src/corelib/tools/qstring.cpp @@ -565,7 +565,7 @@ const QString::Null QString::null = { }; and join a list of strings into a single string with an optional separator using QStringList::join(). You can obtain a list of strings from a string list that contain a particular substring or - that match a particular QRegExp using the QStringList::find() + that match a particular QRegExp using the QStringList::filter() function. : \section1 Querying String Data |