diff options
author | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 06:29:13 (GMT) |
---|---|---|
committer | Warwick Allison <warwick.allison@nokia.com> | 2009-08-14 06:29:13 (GMT) |
commit | 0c831b8cf84c72ee8673d1d38f4e93e350dddd5f (patch) | |
tree | 84fc3c89d73342ec70d77b2bdf99066f987536b8 /examples/tools/customcompleter | |
parent | b98b7d305ffebb700e471bd64a7dee59d947e056 (diff) | |
parent | 4b1b93f3f97de70af316052bc38048f52631b9e4 (diff) | |
download | Qt-0c831b8cf84c72ee8673d1d38f4e93e350dddd5f.zip Qt-0c831b8cf84c72ee8673d1d38f4e93e350dddd5f.tar.gz Qt-0c831b8cf84c72ee8673d1d38f4e93e350dddd5f.tar.bz2 |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'examples/tools/customcompleter')
-rw-r--r-- | examples/tools/customcompleter/main.cpp | 2 | ||||
-rw-r--r-- | examples/tools/customcompleter/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/tools/customcompleter/mainwindow.h | 2 | ||||
-rw-r--r-- | examples/tools/customcompleter/resources/wordlist.txt | 1 | ||||
-rw-r--r-- | examples/tools/customcompleter/textedit.cpp | 2 | ||||
-rw-r--r-- | examples/tools/customcompleter/textedit.h | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/examples/tools/customcompleter/main.cpp b/examples/tools/customcompleter/main.cpp index b66606f..27cccbe 100644 --- a/examples/tools/customcompleter/main.cpp +++ b/examples/tools/customcompleter/main.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$ ** ****************************************************************************/ diff --git a/examples/tools/customcompleter/mainwindow.cpp b/examples/tools/customcompleter/mainwindow.cpp index 2665960..24418d3 100644 --- a/examples/tools/customcompleter/mainwindow.cpp +++ b/examples/tools/customcompleter/mainwindow.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$ ** ****************************************************************************/ diff --git a/examples/tools/customcompleter/mainwindow.h b/examples/tools/customcompleter/mainwindow.h index bac0713..c461068 100644 --- a/examples/tools/customcompleter/mainwindow.h +++ b/examples/tools/customcompleter/mainwindow.h @@ -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$ ** ****************************************************************************/ diff --git a/examples/tools/customcompleter/resources/wordlist.txt b/examples/tools/customcompleter/resources/wordlist.txt index a5de826..f8b581a 100644 --- a/examples/tools/customcompleter/resources/wordlist.txt +++ b/examples/tools/customcompleter/resources/wordlist.txt @@ -1337,7 +1337,6 @@ transparency transparent travel traveled -Trolltech true try turn diff --git a/examples/tools/customcompleter/textedit.cpp b/examples/tools/customcompleter/textedit.cpp index 1453190..20e9579 100644 --- a/examples/tools/customcompleter/textedit.cpp +++ b/examples/tools/customcompleter/textedit.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$ ** ****************************************************************************/ diff --git a/examples/tools/customcompleter/textedit.h b/examples/tools/customcompleter/textedit.h index b9bd010..f970a7e 100644 --- a/examples/tools/customcompleter/textedit.h +++ b/examples/tools/customcompleter/textedit.h @@ -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$ ** ****************************************************************************/ |