diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 16:29:13 +1000 |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 16:29:13 +1000 |
| commit | 0c831b8cf84c72ee8673d1d38f4e93e350dddd5f (patch) | |
| tree | 84fc3c89d73342ec70d77b2bdf99066f987536b8 /src/gui/widgets/qvalidator.cpp | |
| parent | b98b7d305ffebb700e471bd64a7dee59d947e056 (diff) | |
| parent | 4b1b93f3f97de70af316052bc38048f52631b9e4 (diff) | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/widgets/qvalidator.cpp')
| -rw-r--r-- | src/gui/widgets/qvalidator.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/widgets/qvalidator.cpp b/src/gui/widgets/qvalidator.cpp index 51048cca4..7db0247b5 100644 --- a/src/gui/widgets/qvalidator.cpp +++ b/src/gui/widgets/qvalidator.cpp @@ -34,7 +34,7 @@ ** met: http://www.gnu.org/copyleft/gpl.html. ** ** If you are unsure which license is appropriate for your use, please -** contact the sales department at http://www.qtsoftware.com/contact. +** contact the sales department at http://qt.nokia.com/contact. ** $QT_END_LICENSE$ ** ****************************************************************************/ @@ -90,7 +90,7 @@ QT_BEGIN_NAMESPACE Intermediate, and "asdf" and 1114 is \l Invalid. \i For an editable combobox that accepts URLs, any well-formed URL - is \l Acceptable, "http://qtsoftware.com/," is \l Intermediate + is \l Acceptable, "http://example.com/," is \l Intermediate (it might be a cut and paste action that accidentally took in a comma at the end), the empty string is \l Intermediate (the user might select and delete all of the text in preparation for entering @@ -98,7 +98,7 @@ QT_BEGIN_NAMESPACE \i For a spin box that accepts lengths, "11cm" and "1in" are \l Acceptable, "11" and the empty string are \l Intermediate, and - "http://qtsoftware.com" and "hour" are \l Invalid. + "http://example.com" and "hour" are \l Invalid. \endlist |