diff options
| author | Michael Brasser <michael.brasser@nokia.com> | 2009-08-13 04:37:41 (GMT) |
|---|---|---|
| committer | Michael Brasser <michael.brasser@nokia.com> | 2009-08-13 04:37:41 (GMT) |
| commit | efe66141d535d1741f302efff9248db726cd66b1 (patch) | |
| tree | a495722170c03ab9ee27b9cdc347c13a9d9e61f3 /doc/src/snippets/moc | |
| parent | 89a2087b7ec5e36f7f4dd16d942aa23d2c7a6042 (diff) | |
| parent | 07d2ce1e6df9f2b5b9c3263741f9a8f160cdbc80 (diff) | |
| download | Qt-efe66141d535d1741f302efff9248db726cd66b1.zip Qt-efe66141d535d1741f302efff9248db726cd66b1.tar.gz Qt-efe66141d535d1741f302efff9248db726cd66b1.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into kinetic-declarativeui
Conflicts:
configure
configure.exe
mkspecs/features/qt.prf
src/corelib/global/qglobal.h
src/corelib/kernel/qobject_p.h
Diffstat (limited to 'doc/src/snippets/moc')
| -rw-r--r-- | doc/src/snippets/moc/main.cpp | 2 | ||||
| -rw-r--r-- | doc/src/snippets/moc/myclass1.h | 2 | ||||
| -rw-r--r-- | doc/src/snippets/moc/myclass2.h | 2 | ||||
| -rw-r--r-- | doc/src/snippets/moc/myclass3.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/doc/src/snippets/moc/main.cpp b/doc/src/snippets/moc/main.cpp index 7d10962..f57fbae 100644 --- a/doc/src/snippets/moc/main.cpp +++ b/doc/src/snippets/moc/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/doc/src/snippets/moc/myclass1.h b/doc/src/snippets/moc/myclass1.h index 8d76c2a..0ccc86e 100644 --- a/doc/src/snippets/moc/myclass1.h +++ b/doc/src/snippets/moc/myclass1.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/doc/src/snippets/moc/myclass2.h b/doc/src/snippets/moc/myclass2.h index 56d625f..dfbc954 100644 --- a/doc/src/snippets/moc/myclass2.h +++ b/doc/src/snippets/moc/myclass2.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/doc/src/snippets/moc/myclass3.h b/doc/src/snippets/moc/myclass3.h index 2d0134d..b6cf974 100644 --- a/doc/src/snippets/moc/myclass3.h +++ b/doc/src/snippets/moc/myclass3.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$ ** ****************************************************************************/ |