diff options
author | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 07:04:56 (GMT) |
---|---|---|
committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-08-12 07:04:56 (GMT) |
commit | 1047445648b7eb5b85107c00ea43885b44f891cd (patch) | |
tree | 0f9735d5a1b83cb1e3764c4d388f96bff20f2a8b /src/gui/kernel | |
parent | 96b6a3c9cd84dbd90bd1fac84a077c01062c5871 (diff) | |
download | Qt-1047445648b7eb5b85107c00ea43885b44f891cd.zip Qt-1047445648b7eb5b85107c00ea43885b44f891cd.tar.gz Qt-1047445648b7eb5b85107c00ea43885b44f891cd.tar.bz2 |
Replace some mentions of Trolltech with more appropriate terms.
Reviewed-by: Trust Me
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qmotifdnd_x11.cpp | 2 | ||||
-rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qmotifdnd_x11.cpp b/src/gui/kernel/qmotifdnd_x11.cpp index 10c4e48..d180ecc 100644 --- a/src/gui/kernel/qmotifdnd_x11.cpp +++ b/src/gui/kernel/qmotifdnd_x11.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ /* The following copyright notice pertains to the code as contributed -to Trolltech, not to Trolltech's modifications. It is replicated +to Qt, not to Nokia's modifications. It is replicated in doc/dnd.doc, where the documentation system can see it. */ /* Copyright 1996 Daniel Dardailler. diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 36d6ff6..48a4bc3 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -2245,7 +2245,7 @@ void QWidgetPrivate::createWindow_sys() OSWindowRef windowRef = qt_mac_create_window(q, topExtra->wclass, wattr, data.crect); if (windowRef == 0) - qWarning("QWidget: Internal error: %s:%d: If you reach this error please contact Trolltech and include the\n" + qWarning("QWidget: Internal error: %s:%d: If you reach this error please contact Qt Support and include the\n" " WidgetFlags used in creating the widget.", __FILE__, __LINE__); #ifndef QT_MAC_USE_COCOA finishCreateWindow_sys_Carbon(windowRef); |