diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-20 12:45:16 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-20 12:45:16 (GMT) |
| commit | 7b49dee3036603a99e8367f715d6ebde933ab6ba (patch) | |
| tree | 1c0d56f5e487e76c5470aeb9b62f2b033f25836d /src/corelib/kernel | |
| parent | c6f8b600cb1635bef425b3d2232213fb41ea96bd (diff) | |
| parent | fc6e0155cc3fa9beb3b48704a1effe87a74c2779 (diff) | |
| download | Qt-7b49dee3036603a99e8367f715d6ebde933ab6ba.zip Qt-7b49dee3036603a99e8367f715d6ebde933ab6ba.tar.gz Qt-7b49dee3036603a99e8367f715d6ebde933ab6ba.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/corelib/kernel')
| -rw-r--r-- | src/corelib/kernel/qsharedmemory.cpp | 4 | ||||
| -rw-r--r-- | src/corelib/kernel/qtimer.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/kernel/qsharedmemory.cpp b/src/corelib/kernel/qsharedmemory.cpp index 9853079..87e154f 100644 --- a/src/corelib/kernel/qsharedmemory.cpp +++ b/src/corelib/kernel/qsharedmemory.cpp @@ -129,6 +129,10 @@ QSharedMemoryPrivate::makePlatformSafeKey(const QString &key, detached from the segment, and no references to the segment remain. Do not mix using QtSharedMemory and QSharedMemory. Port everything to QSharedMemory. + + \warning QSharedMemory changes the key in a Qt-specific way. + It is therefore currently not possible to use the shared memory of + non-Qt applications with QSharedMemory. */ /*! diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index 01e81ab..4b3feb0 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -77,7 +77,7 @@ QT_BEGIN_NAMESPACE In multithreaded applications, you can use QTimer in any thread that has an event loop. To start an event loop from a non-GUI - thread, use QThread::exec(). Qt uses the the timer's + thread, use QThread::exec(). Qt uses the timer's \l{QObject::thread()}{thread affinity} to determine which thread will emit the \l{QTimer::}{timeout()} signal. Because of this, you must start and stop the timer in its thread; it is not possible to |