diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-11-26 18:55:41 (GMT) |
---|---|---|
committer | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-11-26 18:55:41 (GMT) |
commit | a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250 (patch) | |
tree | dd0742d8d8f1ac20b78a5142b81a78ad89158b5c /demos | |
parent | 58504ad5ec6c467f90a355b1ca9c1a474ad3bcdc (diff) | |
parent | 2b18e27c041f17bbc8989aa0ef5363df34edb8e6 (diff) | |
download | Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.zip Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.tar.gz Qt-a7e1ff2b3fc0b5d6cad039f3fe19e31b12089250.tar.bz2 |
Merge remote-tracking branch 'qt-qa-review/master'
Diffstat (limited to 'demos')
-rw-r--r-- | demos/mobile/quickhit/ga_src/GEInterfaces.h | 2 | ||||
-rw-r--r-- | demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/demos/mobile/quickhit/ga_src/GEInterfaces.h b/demos/mobile/quickhit/ga_src/GEInterfaces.h index 7abd984..059e5b3 100644 --- a/demos/mobile/quickhit/ga_src/GEInterfaces.h +++ b/demos/mobile/quickhit/ga_src/GEInterfaces.h @@ -57,7 +57,7 @@ namespace GE { virtual int pullAudio( AUDIO_SAMPLE_TYPE *target, int bufferLength ) = 0; virtual bool canBeDestroyed() { return false; } - IAudioSource *m_next; // for listing, do not touch if you dont know what you are doing. + IAudioSource *m_next; // for listing, do not touch if you don't know what you are doing. }; diff --git a/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp b/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp index fe1d424..59e21a8 100644 --- a/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp +++ b/demos/spectrum/3rdparty/fftreal/stopwatch/ClockCycleCounter.cpp @@ -231,7 +231,7 @@ void ClockCycleCounter::compute_measure_time_total () Name: compute_measure_time_lap Description: Computes the duration of one stop_lap() call and store it. It will be used - later to get the real duration of the measured operation (by substracting + later to get the real duration of the measured operation (by subtracting the measurement duration). Throws: Nothing ============================================================================== |