diff options
author | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 14:02:51 +0200 |
---|---|---|
committer | Morten Sørvig <msorvig@trolltech.com> | 2009-08-24 14:02:51 +0200 |
commit | e3078a5db9e092d78813180ce077789551929e4f (patch) | |
tree | fce2a4b5607c8dc796faececf71f78ae83effe4e /src/gui/kernel/qwidget.cpp | |
parent | 3a801a667c7c78076fc4aa84e47432ddd4a382a5 (diff) | |
parent | db0ebfd97d14bf3c537957d9642ba014318f8418 (diff) |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt into 4.5
Diffstat (limited to 'src/gui/kernel/qwidget.cpp')
-rw-r--r-- | src/gui/kernel/qwidget.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 1e0f09c00..d8476095e 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.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$ ** ****************************************************************************/ @@ -4194,7 +4194,7 @@ void QWidget::setForegroundRole(QPalette::ColorRole role) assigning roles to a widget's palette is not guaranteed to change the appearance of the widget. Instead, you may choose to apply a \l styleSheet. You can refer to our Knowledge Base article - \l{http://qtsoftware.com/developer/knowledgebase/22}{here} for more + \l{http://qt.nokia.com/developer/knowledgebase/22}{here} for more information. \warning Do not use this function in conjunction with \l{Qt Style Sheets}. |