diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-13 09:51:04 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-13 09:51:11 (GMT) |
| commit | 63856f13721bce420fe94dab31c36329af976276 (patch) | |
| tree | 5a2c1d5d49a76a7794fcfd46a6fa664f657ae0fe /src/gui/styles | |
| parent | f5c5cc585cef8d2d2f77e7d83d7a07c6d70f0d09 (diff) | |
| parent | 6e209bb09f3feef210bc65f94cf8f58dd8e3b4a9 (diff) | |
| download | Qt-63856f13721bce420fe94dab31c36329af976276.zip Qt-63856f13721bce420fe94dab31c36329af976276.tar.gz Qt-63856f13721bce420fe94dab31c36329af976276.tar.bz2 | |
Merge commit upstream/4.6 into oslo-staging-2/4.6
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qs60style.cpp | 2 | ||||
| -rw-r--r-- | src/gui/styles/qs60style.h | 2 | ||||
| -rw-r--r-- | src/gui/styles/qs60style_p.h | 2 | ||||
| -rw-r--r-- | src/gui/styles/qs60style_s60.cpp | 2 | ||||
| -rw-r--r-- | src/gui/styles/qs60style_simulated.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 9179237..df4b87e 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtGui of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/gui/styles/qs60style.h b/src/gui/styles/qs60style.h index 885ea40..cd63431 100644 --- a/src/gui/styles/qs60style.h +++ b/src/gui/styles/qs60style.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtGui of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/gui/styles/qs60style_p.h b/src/gui/styles/qs60style_p.h index b9789b9..cfe87ac 100644 --- a/src/gui/styles/qs60style_p.h +++ b/src/gui/styles/qs60style_p.h @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtGui of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/gui/styles/qs60style_s60.cpp b/src/gui/styles/qs60style_s60.cpp index b5f2d1c..a8dbf8d 100644 --- a/src/gui/styles/qs60style_s60.cpp +++ b/src/gui/styles/qs60style_s60.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtGui of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage diff --git a/src/gui/styles/qs60style_simulated.cpp b/src/gui/styles/qs60style_simulated.cpp index 4317483..55d5771 100644 --- a/src/gui/styles/qs60style_simulated.cpp +++ b/src/gui/styles/qs60style_simulated.cpp @@ -4,7 +4,7 @@ ** All rights reserved. ** Contact: Nokia Corporation (qt-info@nokia.com) ** -** This file is part of the QtGui of the Qt Toolkit. +** This file is part of the QtGui module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL$ ** No Commercial Usage |