diff options
| -rw-r--r-- | tools/qmeegographicssystemhelper/qmeegographicssystemhelper.h | 2 | ||||
| -rw-r--r-- | tools/qtestlib/wince/cetest/activesyncconnection.cpp | 2 | ||||
| -rw-r--r-- | tools/qtestlib/wince/cetest/main.cpp | 2 | ||||
| -rw-r--r-- | tools/qvfb/qvfb.cpp | 2 | ||||
| -rw-r--r-- | tools/runonphone/symbianutils/tcftrkdevice.h | 2 | ||||
| -rw-r--r-- | tools/runonphone/symbianutils/tcftrkmessage.h | 2 | ||||
| -rw-r--r-- | util/normalize/main.cpp | 2 | ||||
| -rw-r--r-- | util/s60pixelmetrics/pm_mapperapp.cpp | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.h b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.h index 2bb75eb..2baacbb 100644 --- a/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.h +++ b/tools/qmeegographicssystemhelper/qmeegographicssystemhelper.h @@ -147,7 +147,7 @@ public: //! Destroys an EGL shared image. /*! Destroys an EGLSharedImage previously created with an ::imageToEGLSharedImage call. - Returns true if the image was found and the destruction was successfull. Notice that + Returns true if the image was found and the destruction was successful. Notice that this destroys the image for all processes using it. */ static bool destroyEGLSharedImage(Qt::HANDLE handle); diff --git a/tools/qtestlib/wince/cetest/activesyncconnection.cpp b/tools/qtestlib/wince/cetest/activesyncconnection.cpp index 98062ed..812ed47 100644 --- a/tools/qtestlib/wince/cetest/activesyncconnection.cpp +++ b/tools/qtestlib/wince/cetest/activesyncconnection.cpp @@ -247,7 +247,7 @@ bool ActiveSyncConnection::copyFileFromDevice(const QString &deviceSource, const wprintf(L"\n"); if (!readUntilEnd) { - debugOutput(QString::fromLatin1(" an error occured during copy"), 2); + debugOutput(QString::fromLatin1(" an error occurred during copy"), 2); return false; } diff --git a/tools/qtestlib/wince/cetest/main.cpp b/tools/qtestlib/wince/cetest/main.cpp index 4272a83..ec62af1 100644 --- a/tools/qtestlib/wince/cetest/main.cpp +++ b/tools/qtestlib/wince/cetest/main.cpp @@ -283,7 +283,7 @@ int main(int argc, char **argv) cout << "Error: Can only test executables!" << endl; return -1; } - // Check wether the project is still in debug/release mode after reading + // Check whether the project is still in debug/release mode after reading // If .pro specifies to be one mode only, we need to accept this if (project.isActiveConfig("debug") && !project.isActiveConfig("release")) { TestConfiguration::testDebug = true; diff --git a/tools/qvfb/qvfb.cpp b/tools/qvfb/qvfb.cpp index b4ccebc..a3b1964 100644 --- a/tools/qvfb/qvfb.cpp +++ b/tools/qvfb/qvfb.cpp @@ -1038,7 +1038,7 @@ void AnimationSaveWidget::convertToMpeg(QString filename) // ### can't use QProcess, not in Qt 2.3 // ### but it's certainly in Qt 4! use it? - // Execute the ppmtompeg command as a seperate process to do the encoding + // Execute the ppmtompeg command as a separate process to do the encoding pid_t pid = ::fork(); if ( !pid ) { // Child process diff --git a/tools/runonphone/symbianutils/tcftrkdevice.h b/tools/runonphone/symbianutils/tcftrkdevice.h index 67955e5..f56a86e 100644 --- a/tools/runonphone/symbianutils/tcftrkdevice.h +++ b/tools/runonphone/symbianutils/tcftrkdevice.h @@ -65,7 +65,7 @@ struct Breakpoint; /* Command error handling in TCF: * 1) 'Severe' errors (JSON format, parameter format): Trk emits a - * nonstandard message (\3\2 error paramaters) and closes the connection. + * nonstandard message (\3\2 error parameters) and closes the connection. * 2) Protocol errors: 'N' without error message is returned. * 3) Errors in command execution: 'R' with a TCF error hash is returned * (see TcfTrkCommandError). */ diff --git a/tools/runonphone/symbianutils/tcftrkmessage.h b/tools/runonphone/symbianutils/tcftrkmessage.h index 510b485..929a9e6 100644 --- a/tools/runonphone/symbianutils/tcftrkmessage.h +++ b/tools/runonphone/symbianutils/tcftrkmessage.h @@ -123,7 +123,7 @@ struct SYMBIANUTILS_EXPORT RunControlContext { QByteArray parentId; // Parent process id of a thread. }; -// Module load information occuring with 'RunControl contextSuspended' events +// Module load information occurring with 'RunControl contextSuspended' events struct SYMBIANUTILS_EXPORT ModuleLoadEventInfo { ModuleLoadEventInfo(); void clear(); diff --git a/util/normalize/main.cpp b/util/normalize/main.cpp index 4658b5e..65b8d51 100644 --- a/util/normalize/main.cpp +++ b/util/normalize/main.cpp @@ -159,7 +159,7 @@ int main(int argc, char *argv[]) printf("usage: normalize [--modify] <path>\n"); printf(" <path> can be a single file or a directory (default: look for *.cpp recursively)"); printf(" Outputs all filenames that contain non-normalized SIGNALs and SLOTs\n"); - printf(" with --modify: fix all occurences of non-normalized SIGNALs and SLOTs\n"); + printf(" with --modify: fix all occurrences of non-normalized SIGNALs and SLOTs\n"); return 1; } diff --git a/util/s60pixelmetrics/pm_mapperapp.cpp b/util/s60pixelmetrics/pm_mapperapp.cpp index d68a0b0..b0c4eaf 100644 --- a/util/s60pixelmetrics/pm_mapperapp.cpp +++ b/util/s60pixelmetrics/pm_mapperapp.cpp @@ -299,7 +299,7 @@ void CPixelMetricsMapperAppUi::HandleCommandL( TInt aCommand ) TInt height = screenRect.Height(); TInt width = screenRect.Width(); TBuf16<32> tgt; - // HEIGTH + // HEIGHT tgt.Append(_L("height: \t")); tgt.AppendNum(height, EDecimal); // put max height into text file ShowL( tgt, last ); |