summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-10-17 07:29:02 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-10-17 07:29:02 (GMT)
commit16e5b7a2c2a6803a75ae3fb24308bac0bc8e3849 (patch)
treef07da770add2e1e10354ed0543f8545d91c6640c
parentf079ac902cb7b41b02d341ef3497b0ab357079e1 (diff)
parent968d4a3c2c01d6afdfeb2537b960169968942d9d (diff)
downloadQt-16e5b7a2c2a6803a75ae3fb24308bac0bc8e3849.zip
Qt-16e5b7a2c2a6803a75ae3fb24308bac0bc8e3849.tar.gz
Qt-16e5b7a2c2a6803a75ae3fb24308bac0bc8e3849.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public: Typo fix
-rw-r--r--src/gui/kernel/qapplication.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp
index 34decef..9d8b590 100644
--- a/src/gui/kernel/qapplication.cpp
+++ b/src/gui/kernel/qapplication.cpp
@@ -3394,7 +3394,7 @@ QString QApplication::sessionKey() const
\fn void QApplication::aboutToReleaseGpuResources()
This signal is emitted when application is about to release all
- GPU resources accociated to contexts owned by application.
+ GPU resources associated to contexts owned by application.
The signal is particularly useful if your application has allocated
GPU resources directly apart from Qt and needs to do some last-second