diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 16:06:30 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-10-30 16:06:30 (GMT) |
| commit | 4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11 (patch) | |
| tree | f19b0091967ea0211f45ffe23838fff40dbc9ea6 /demos/spectrum/app/spectrumanalyser.cpp | |
| parent | 967afc717ffd411e22ce94de77cf54284815b27e (diff) | |
| parent | e8c01ab0e5fb6134617a69d88ed0cbce24a33da5 (diff) | |
| download | Qt-4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11.zip Qt-4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11.tar.gz Qt-4a6386b0b75f97c6d53efbeb5cd51fb4247c4c11.tar.bz2 | |
Merge branch 4.7 into qt-master-from-4.7
Diffstat (limited to 'demos/spectrum/app/spectrumanalyser.cpp')
| -rw-r--r-- | demos/spectrum/app/spectrumanalyser.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/demos/spectrum/app/spectrumanalyser.cpp b/demos/spectrum/app/spectrumanalyser.cpp index 1cc47a6..2fa17b1 100644 --- a/demos/spectrum/app/spectrumanalyser.cpp +++ b/demos/spectrum/app/spectrumanalyser.cpp @@ -64,6 +64,8 @@ SpectrumAnalyserThread::SpectrumAnalyserThread(QObject *parent) #endif { #ifdef SPECTRUM_ANALYSER_SEPARATE_THREAD + // moveToThread() cannot be called on a QObject with a parent + setParent(0); moveToThread(m_thread); m_thread->start(); #endif |