Commit 592e494d authored by Tobias Hunger's avatar Tobias Hunger

Fix typos

Reviewed-by: thorbjorn
parent 443a0377
......@@ -40,7 +40,7 @@ class FancyLineEditPrivate;
/* A line edit with an embedded pixmap on one side that is connected to
* a menu. Additionally, it can display a grayed hintText (like "Type Here to")
* when not focussed and empty. When connecting to the changed signals and
* when not focused and empty. When connecting to the changed signals and
* querying text, one has to be aware that the text is set to that hint
* text if isShowingHintText() returns true (that is, does not contain
* valid user input).
......
......@@ -150,7 +150,7 @@ void BookmarkDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
painter->drawText(6, 2 + opt.rect.top() + fm.ascent(), topLeft);
QString topRight = index.data(BookmarkManager::LineNumber).toString();
// Check wheter we need to be fancy and paint some background
// Check whether we need to be fancy and paint some background
int fwidth = fm.width(topLeft);
if (fwidth + lwidth > opt.rect.width()) {
int left = opt.rect.right() - lwidth;
......
......@@ -279,7 +279,7 @@ bool CMakeProject::parseCMakeLists()
//qDebug()<<" Executable:"<<ct.executable<<"WD:"<<ct.workingDirectory;
ProjectExplorer::RunConfiguration *rc(new CMakeRunConfiguration(this, ct.executable, ct.workingDirectory, ct.title));
addRunConfiguration(rc);
// The first one gets the honour of beeing the active one
// The first one gets the honour of being the active one
if (setActive) {
setActiveRunConfiguration(rc);
setActive = false;
......@@ -378,7 +378,7 @@ void CMakeProject::buildTree(CMakeProjectNode *rootNode, QList<ProjectExplorer::
rootNode->addFileNodes(QList<ProjectExplorer::FileNode *>()<< fn, folder);
}
// remove old file nodes and check wheter folder nodes can be removed
// remove old file nodes and check whether folder nodes can be removed
foreach (ProjectExplorer::FileNode *fn, deleted) {
ProjectExplorer::FolderNode *parent = fn->parentFolderNode();
// qDebug()<<"removed"<<fn->path();
......
......@@ -68,7 +68,7 @@ int CMakeManager::projectLanguage() const
ProjectExplorer::Project *CMakeManager::openProject(const QString &fileName)
{
// TODO check wheter this project is already opened
// TODO check whether this project is already opened
return new CMakeProject(this, fileName);
}
......
......@@ -65,7 +65,7 @@ public:
const QString &initialPage = QString());
~SettingsDialog();
// Run the dialog and return true if 'Ok' was choosen or 'Apply' was invoked
// Run the dialog and return true if 'Ok' was chosen or 'Apply' was invoked
// at least once
bool execDialog();
......
......@@ -207,7 +207,7 @@ void FancyTabBar::paintTab(QPainter *painter, int tabIndex) const
bool hover = (tabIndex == m_hoverIndex);
#ifdef Q_WS_MAC
hover = false; // Dont hover on Mac
hover = false; // Do not hover on Mac
#endif
QColor background = QColor(0, 0, 0, 10);
......
......@@ -64,7 +64,7 @@ public:
virtual NavigationView createWidget() = 0;
// Read and store settings for the widget, created by this factory
// and beeing at position position. (The position is important since
// and being at position position. (The position is important since
// a certain type of widget could exist multiple times.)
virtual void saveSettings(int position, QWidget *widget);
virtual void restoreSettings(int position, QWidget *widget);
......
......@@ -62,10 +62,10 @@ public:
// This function is called to give the outputwindow focus
virtual void setFocus() = 0;
// Wheter the outputpane has focus
// Whether the outputpane has focus
virtual bool hasFocus() = 0;
// Wheter the outputpane can be focused at the moment.
// (E.g. the search result window doesn't want to be focussed if the are no results.)
// Whether the outputpane can be focused at the moment.
// (E.g. the search result window does not want to be focused if the are no results.)
virtual bool canFocus() = 0;
virtual bool canNavigate() = 0;
......
......@@ -298,7 +298,7 @@ bool MainWindow::init(QString *errorMessage)
pm->addObject(m_shortcutSettings);
// Add widget to the bottom, we create the view here instead of inside the
// OutputPaneManager, since the StatusBarManager needs to be initilized before
// OutputPaneManager, since the StatusBarManager needs to be initialized before
m_outputView = new Core::StatusBarWidget;
m_outputView->setWidget(OutputPaneManager::instance()->buttonsWidget());
m_outputView->setPosition(Core::StatusBarWidget::Second);
......
......@@ -79,7 +79,7 @@ bool panelWidget(const QWidget *widget)
if (!widget)
return false;
// Dont style dialogs or explicitly ignored widgets
// Do not style dialogs or explicitly ignored widgets
if (qobject_cast<const QDialog *>(widget->window()))
return false;
......
......@@ -70,7 +70,7 @@ void MessageManager::showOutputPane()
void MessageManager::displayStatusBarMessage(const QString & /*text*/, int /*ms*/)
{
// TODO: Currently broken, but noone really notices, so...
// TODO: Currently broken, but no one really notices, so...
//m_mainWindow->statusBar()->showMessage(text, ms);
}
......
......@@ -807,7 +807,7 @@ MimeMapEntry::MimeMapEntry(const MimeType &t, int aLevel) :
* - Multiple inheritance (several subClassesOf) can occur
* - Provide quick lookup by name
* - Provide quick lookup by file type.
* This basically rules out some pointer-based tree, so the structure choosen
* This basically rules out some pointer-based tree, so the structure chosen
* is:
* - An alias map <QString->QString> for mapping aliases to types
* - A Map <QString-MimeMapEntry> for the types (MimeMapEntry being a pair of
......
......@@ -238,18 +238,18 @@ QString SettingsDatabase::group() const
QStringList SettingsDatabase::childKeys() const
{
QStringList childs;
QStringList children;
const QString g = group();
QMapIterator<QString, QVariant> i(d->m_settings);
while (i.hasNext()) {
const QString &key = i.next().key();
if (key.startsWith(g) && key.indexOf(QLatin1Char('/'), g.length() + 1) == -1) {
childs.append(key.mid(g.length() + 1));
children.append(key.mid(g.length() + 1));
}
}
return childs;
return children;
}
void SettingsDatabase::sync()
......
......@@ -236,7 +236,7 @@ bool dissassemble(CIDebugClient *client,
beforeLines, beforeLines + afterLines,
offset, flags, 0, 0, 0, 0);
if (FAILED(hr)) {
*errorMessage= QString::fromLatin1("Unable to dissamble at 0x%1: %2").
*errorMessage= QString::fromLatin1("Unable to disassamble at 0x%1: %2").
arg(offset, 0, 16).arg(msgComFailed("OutputDisassemblyLines", hr));
return false;
}
......
......@@ -86,7 +86,7 @@ static const char *dumperPrefixC = "dumper:";
* that complex functions only work from 'well-defined' breakpoints
* (such as main()) and otherwise cause access violation exceptions
* (for example LoadLibrary).
* Exceptions occuring in the functions to be called must be handled
* Exceptions occurring in the functions to be called must be handled
* by __try/__except (they show up in the debugger and must acknowledged
* by gN (go not handled). */
......@@ -669,7 +669,7 @@ CdbDumperHelper::DumpResult CdbDumperHelper::dumpTypeI(const WatchData &wd, bool
return DumpNotHandled;
}
if (wd.addr.isEmpty()) {
*errorMessage = QString::fromLatin1("Adress is missing for '%1' (%2).").arg(wd.exp, wd.type);
*errorMessage = QString::fromLatin1("Address is missing for '%1' (%2).").arg(wd.exp, wd.type);
return DumpNotHandled;
}
......
......@@ -168,7 +168,7 @@ CdbStackFrameContext *CdbStackTraceContext::frameContextAt(int index, QString *e
*errorMessage = msgFrameContextFailed(index, m_frames.at(index), *errorMessage);
return 0;
}
// Exclude unitialized variables if desired
// Exclude uninitialized variables if desired
QStringList uninitializedVariables;
if (theDebuggerAction(UseCodeModel)->isChecked()) {
const StackFrame &frame = m_frames.at(index);
......
......@@ -489,7 +489,7 @@ WatchData CdbSymbolGroupContext::watchDataAt(unsigned long index) const
wd.addr = hexSymbolOffset(m_symbolGroup, index).toLatin1();
const QString type = getSymbolString(m_symbolGroup, &IDebugSymbolGroup2::GetSymbolTypeNameWide, index);
wd.setType(type);
// Check for unitialized variables at level 0 only.
// Check for uninitialized variables at level 0 only.
const DEBUG_SYMBOL_PARAMETERS &p = m_symbolParameters.at(index);
if (p.ParentSymbol == DEBUG_ANY_ID && m_uninitializedVariables.contains(fullShadowedName)) {
wd.setError(WatchData::msgNotInScope());
......
......@@ -236,7 +236,7 @@ void DisassemblerViewAgent::setFrame(const StackFrame &frame)
if (!frame.function.isEmpty() && frame.function != _("??")) {
QHash<QString, QString>::ConstIterator it = d->cache.find(frameKey(frame));
if (it != d->cache.end()) {
QString msg = _("Use cache dissassembler for '%1' in '%2'")
QString msg = _("Use cache disassembler for '%1' in '%2'")
.arg(frame.function).arg(frame.file);
d->manager->showDebuggerOutput(msg);
setContents(*it);
......
......@@ -276,7 +276,7 @@ void GdbEngine::initializeVariables()
m_gdbVersion = 100;
m_gdbBuildVersion = -1;
m_isMacGdb = false;
m_isSynchroneous = false;
m_isSynchronous = false;
m_registerNamesListed = false;
m_fullToShortName.clear();
......@@ -1113,7 +1113,7 @@ void GdbEngine::handleAqcuiredInferior()
#ifndef Q_OS_MAC
// intentionally after tryLoadDebuggingHelpers(),
// otherwise we'd interupt solib loading.
// otherwise we'd interrupt solib loading.
if (theDebuggerBoolSetting(AllPluginBreakpoints)) {
postCommand("set auto-solib-add on");
postCommand("set stop-on-solib-events 0");
......@@ -1467,9 +1467,9 @@ void GdbEngine::handleIsSynchroneous(const GdbResponse &response)
{
Q_UNUSED(response);
if (response.resultClass == GdbResultDone) {
m_isSynchroneous = true;
m_isSynchronous = true;
} else {
m_isSynchroneous = false;
m_isSynchronous = false;
}
}
......@@ -2136,7 +2136,7 @@ void GdbEngine::extractDataFromInfoBreak(const QString &output, BreakpointData *
data->bpLineNumber = re.cap(4).toLatin1();
QString full = fullName(re.cap(3));
if (full.isEmpty()) {
// FIXME: This happens without UsePreciseBreakpoints regularily.
// FIXME: This happens without UsePreciseBreakpoints regularly.
// We need to revive that "fill full name mapping bit by bit"
// approach of 1.2.x
//qDebug() << "NO FULL NAME KNOWN FOR" << re.cap(3);
......@@ -4168,7 +4168,7 @@ void GdbEngine::tryQueryDebuggingHelpers()
void GdbEngine::recheckDebuggingHelperAvailability()
{
if (m_gdbAdapter->dumperHandling() != AbstractGdbAdapter::DumperNotAvailable) {
// retreive list of dumpable classes
// retrieve list of dumpable classes
postCommand("call (void*)qDumpObjectData440(1,0,0,0,0,0,0,0)");
postCommand("p (char*)&qDumpOutBuffer", CB(handleQueryDebuggingHelper));
}
......@@ -4511,9 +4511,9 @@ bool GdbEngine::startGdb(const QStringList &args, const QString &gdb, const QStr
// Pass means let program see this signal;
// otherwise program doesn't know.
// Pass and Stop may be combined.
// We need "print" as otherwise we would get no feedback whatsoever
// Custom DebuggingHelper crashs which happen regularily for when accessing
// uninitialized variables.
// We need "print" as otherwise we will get no feedback whatsoever
// when Custom DebuggingHelper crash (which happen regularly when accessing
// uninitialized variables).
postCommand("handle SIGSEGV nopass stop print");
// This is useful to kill the inferior whenever gdb dies.
......@@ -4700,7 +4700,7 @@ QMessageBox * GdbEngine::showMessageBox(int icon, const QString &title,
bool GdbEngine::isSynchroneous() const
{
return m_isSynchroneous;
return m_isSynchronous;
}
//
......
......@@ -274,7 +274,7 @@ private: ////////// Gdb Output, State & Capability Handling //////////
int m_gdbVersion; // 6.8.0 is 60800
int m_gdbBuildVersion; // MAC only?
bool m_isMacGdb;
bool m_isSynchroneous; // Can act synchroneously?
bool m_isSynchronous; // Can act synchronously?
private: ////////// Inferior Management //////////
......
......@@ -792,7 +792,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
+ ",TextSeg=" + hexNumber(lib.codeseg)
+ ",DataSeg=" + hexNumber(lib.dataseg);
}
sendGdbServerMessage(response, "library information transfered");
sendGdbServerMessage(response, "library information transferred");
} else {
sendGdbServerMessage("l", "library information transfer finished");
}
......@@ -844,7 +844,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
// FIXME: Limit packet length by using qsThreadInfo packages?
qDebug() << "CURRENT THREAD: " << m_session.tid;
response += hexNumber(m_session.tid);
sendGdbServerMessage(response, "thread information transfered");
sendGdbServerMessage(response, "thread information transferred");
} else {
sendGdbServerMessage("l", "thread information transfer finished");
}
......@@ -866,7 +866,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
response += "</library>";
}
response += "</library-list>";
sendGdbServerMessage(response, "library information transfered");
sendGdbServerMessage(response, "library information transferred");
}
else if (cmd == "QStartNoAckMode") {
......@@ -967,7 +967,7 @@ void TrkGdbAdapter::handleGdbServerCommand(const QByteArray &cmd)
.toInt(&ok1, 16);
const int length = data.mid(commaPos + 1).toInt(&ok2, 16);
if (ok1 && ok2) {
const QString msg = _("Read of OS auxilary "
const QString msg = _("Read of OS auxiliary "
"vector (%1, %2) not implemented.").arg(offset).arg(length);
logMessage(msgGdbPacket(msg));
sendGdbServerMessage("E20", msg.toLatin1());
......
......@@ -646,7 +646,7 @@ static QString formattedValue(const WatchData &data, int format)
reinterpret_cast<void *>(data.value.toULongLong(&ok, 0));
if (!ok || !addr)
return data.value;
// FIXME: add a round trip throught the debugger to prevent crashs?
// FIXME: add a round trip through the debugger to prevent crashs?
if (format == Latin1StringFormat)
return QString::fromLatin1(static_cast<const char *>(addr));
if (format == Local8BitStringFormat)
......
......@@ -128,7 +128,7 @@ public:
QString type; // type for further processing
QString displayedType;// displayed type (optional)
QByteArray variable; // name of internal Gdb variable if created
QByteArray addr; // displayed adress
QByteArray addr; // displayed address
QByteArray saddr; // stored address (pointer in container)
QString framekey; // key for type cache
QScriptValue scriptValue; // if needed...
......@@ -150,7 +150,7 @@ enum WatchRoles
{
INameRole = Qt::UserRole,
ExpressionRole,
ExpandedRole, // used to communicate prefered expanded state to the view
ExpandedRole, // used to communicate preferred expanded state to the view
ActiveDataRole, // used for tooltip
TypeFormatListRole,
TypeFormatRole, // used to communicate alternative formats to the view
......
......@@ -90,7 +90,7 @@ static const char *settingsGroup = "Designer";
/* Actions of the designer plugin:
* Designer provides a toolbar which is subject to a context change (to
* "edit mode" context) when it is focussed.
* "edit mode" context) when it is focused.
* In order to prevent its actions from being disabled/hidden by that context
* change, the actions are registered on the global context. In currentEditorChanged(),
* the ones that are present in the global edit menu are set visible/invisible manually.
......
......@@ -421,7 +421,7 @@ static void addDeclaration(const QString &docFileName, const Class *cl, const QS
if (ITextEditable *editable = editableAt(docFileName, line, column)) {
unsigned dl, dc; // this position is the beginning of return value: "^void foo(...)"
decl->getStartPosition(&dl, &dc);
dc--; // if the first character in line is 'v' comming from "void" getStartPosition returns 1, not 0, so we always decrement it.
dc--; // if the first character in line is 'v' coming from "void" getStartPosition returns 1, not 0, so we always decrement it.
editable->gotoLine(dl, dc);
editable->position(ITextEditor::StartOfLine);
const QString indentation = QString(dc, QLatin1Char(' '));
......
......@@ -59,7 +59,7 @@ class IOutputParser;
The two functions processStarted() and processFinished() are called after starting/finishing the process.
By default they add a message to the output window.
Use setEnabled() to control wheter the BuildStep needs to run. (A disabled BuildStep immediately returns true,
Use setEnabled() to control whether the BuildStep needs to run. (A disabled BuildStep immediately returns true,
from the run function.)
*/
......@@ -103,7 +103,7 @@ public:
void setEnabled(bool b);
/// If ignoreReturnValue is set to true, then the abstractprocess step will
/// return sucess even if the return value indicates otherwise
/// return success even if the return value indicates otherwise
/// should be called from init
void setIgnoreReturnValue(bool b);
/// Set the Environment for running the command
......
......@@ -99,20 +99,22 @@ public:
IBuildConfigurationFactory(QObject *parent = 0);
virtual ~IBuildConfigurationFactory();
// used to show the list of possible additons to a project, returns a list of types
// Used to show the list of possible additons to a project.
// Returns a list of ids.
virtual QStringList availableCreationIds() const = 0;
// used to translate the types to names to display to the user
virtual QString displayNameForId(const QString &id) const = 0;
// creates build configuration(s) for given type and adds them to project
// if successfull returns the BuildConfiguration that should be shown in the
// project mode for editing
// Creates build configuration(s) for the given id and adds them to
// the project.
// If successful it returns the BuildConfiguration that should be shown in
// project mode.
virtual BuildConfiguration *create(const QString &id) const = 0;
// clones a given BuildConfiguration, should not add it to the project
// Clones a given BuildConfiguration, should not add it to the project
virtual BuildConfiguration *clone(BuildConfiguration *source) const = 0;
// restores a BuildConfiguration with the name and adds it to the project
// Restores a BuildConfiguration with the data given and adds it to the project.
virtual BuildConfiguration *restore(const QVariantMap &values) const = 0;
signals:
......
......@@ -93,7 +93,7 @@ public:
virtual QString displayName() = 0;
// the Widget shown in the project settings dialog for this buildStep
// ownership is transfered to the caller
// ownership is transferred to the caller
virtual BuildStepConfigWidget *createConfigWidget() = 0;
// if this function returns true, the user can't delete this BuildStep for this project
......@@ -129,7 +129,7 @@ class PROJECTEXPLORER_EXPORT IBuildStepFactory
public:
IBuildStepFactory();
virtual ~IBuildStepFactory();
/// Called to check wheter this factory can restore the named BuildStep
/// Called to check whether this factory can restore the named BuildStep
virtual bool canCreate(const QString &id) const = 0;
/// Called to restore a buildstep
virtual BuildStep *create(BuildConfiguration *bc, const QString &id) const = 0;
......
......@@ -259,7 +259,7 @@ QString DebuggingHelperLibrary::qtVersionForQMake(const QString &qmakePath)
QStringList DebuggingHelperLibrary::possibleQMakeCommands()
{
// On windows noone has renamed qmake, right?
// On windows no one has renamed qmake, right?
#ifdef Q_OS_WIN
return QStringList(QLatin1String("qmake.exe"));
#else
......
......@@ -113,7 +113,7 @@ QVariant EnvironmentModel::data(const QModelIndex &index, int role) const
}
}
if (role == Qt::FontRole) {
// check wheter this environment variable exists in m_items
// check whether this environment variable exists in m_items
if (changes(m_resultEnvironment.key(m_resultEnvironment.constBegin() + index.row()))) {
QFont f;
f.setBold(true);
......
......@@ -141,7 +141,7 @@ void Project::saveSettingsImpl(PersistentSettingsWriter &writer)
{
const QList<BuildConfiguration *> bcs = buildConfigurations();
// For compability with older versions the "name" is saved as a string instead of a number
// For compatibility with older versions the "name" is saved as a string instead of a number
writer.saveValue("activebuildconfiguration", QString::number(bcs.indexOf(m_activeBuildConfiguration)));
//save buildsettings
......@@ -288,7 +288,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
//Build Settings
QVariant buildStepsVariant = reader.restoreValue("buildsteps");
if (buildStepsVariant.isValid()) {
// Old code path for 1.3 compability
// Old code path for 1.3 compatibility
// restoring BuildSteps from settings
int pos = 0;
QStringList buildStepNames = buildStepsVariant.toStringList();
......@@ -320,7 +320,7 @@ bool Project::restoreSettingsImpl(PersistentSettingsReader &reader)
QVariant cleanStepsVariant = reader.restoreValue("cleansteps");
if (cleanStepsVariant.isValid()) {
// Old code path for 1.3 compability
// Old code path for 1.3 compatibility
QStringList cleanStepNames = cleanStepsVariant.toStringList();
// restoring BuildSteps from settings
int pos = 0;
......
......@@ -997,7 +997,7 @@ static bool caseInsensitiveLessThan(const QString &s1, const QString &s2)
QStringList SessionManager::sessions() const
{
if (m_sessions.isEmpty()) {
// We aren't yet initalized, so do that now
// We are not initialized yet, so do that now
QDirIterator dirIter(QFileInfo(m_core->settings()->fileName()).path() + "/qtcreator/");
while (dirIter.hasNext()) {
dirIter.next();
......
......@@ -57,7 +57,7 @@ public:
FormEditorItem *beginFormEditorItem() const;
private: // fucntions
private: // functions
void setMargin(FormEditorItem *endItem, AnchorLine::Type endAnchorLine);
private: // variables
......
......@@ -107,7 +107,7 @@ void FormEditorView::modelAttached(Model *model)
}
//This method does the setup of the inital FormEditorItem tree in the scene
//This method does the setup of the initial FormEditorItem tree in the scene
void FormEditorView::setupFormEditorItemTree(const QmlItemNode &qmlItemNode)
{
m_scene->addFormEditorItem(qmlItemNode);
......
......@@ -143,7 +143,7 @@ private: //variables
bool m_isInSubState;
bool m_isInModel;
bool m_isBound;
bool m_isValid; //if the property value belongs to an non existant complexProperty it is invalid
bool m_isValid; // if the property value belongs to a non-existing complexProperty it is invalid
PropertyEditorNodeWrapper *m_complexNode;
};
......
......@@ -214,7 +214,7 @@ bool MoveObjectVisitor::visit(UiArrayBinding *ast)
moveInfo.leadingCharsToRemove = objectLocation - start;
moveInfo.trailingCharsToRemove = end - moveInfo.objectEnd;
} else {
// we're the last member, but not the only member, so remove the preceeding comma too
// we are the last member, but not the only member, so remove the preceding comma, too
Q_ASSERT(currentMember->commaToken.isValid());
int start = currentMember->commaToken.offset;
......
......@@ -78,7 +78,7 @@ namespace QmlDesigner {
/*! \brief Constructor
The class will be rendered offscreen if not setted otherwise.
The class will be rendered offscreen if not set otherwise.
\param Parent of this object. If this parent is deleted this instance is
deleted too.
......@@ -153,9 +153,9 @@ void NodeInstanceView::nodeRemoved(const ModelNode &/*removedNode*/, const NodeA
/*! \brief Notifing the view that a AbstractProperty was added to a ModelNode.
The property will be setted for the NodeInstance.
The property will be set for the NodeInstance.
\param state ModelNode to wich the Property belongs
\param state ModelNode to which the Property belongs
\param property AbstractProperty which was added
\see AbstractProperty NodeInstance ModelNode
*/
......@@ -224,9 +224,9 @@ void NodeInstanceView::bindingPropertiesChanged(const QList<BindingProperty>& pr
/*! \brief Notifing the view that a AbstractProperty value was changed to a ModelNode.
The property will be setted for the NodeInstance.
The property will be set for the NodeInstance.
\param state ModelNode to wich the Property belongs
\param state ModelNode to which the Property belongs
\param property AbstractProperty which was changed
\param newValue New Value of the property
\param oldValue Old Value of the property
......
......@@ -105,7 +105,7 @@ QmlMetaProperty QmlPropertyChangesObject::metaProperty(const QString &property)
{
QmlMetaProperty prop = QmlMetaProperty::createProperty(m_targetObject.data(), property);
if (!prop.isValid()) {
qWarning() << "Cannot assign to non-existant property" << property;
qWarning() << "Cannot assign to non-existent property" << property;
return QmlMetaProperty();
} else if (!prop.isWritable()) {
qWarning() << "Cannot assign to read-only property" << property;
......
......@@ -234,7 +234,7 @@ PropertyMetaInfo AbstractProperty::metaInfo() const
}
/*!
\brief returns wether the property is the default property for the model node.
\brief returns whether the property is the default property for the model node.
*/
bool AbstractProperty::isDefaultProperty() const
{
......
......@@ -124,7 +124,7 @@ bool MakeStep::init()
// If we are cleaning, then make can fail with a error code, but that doesn't mean
// we should stop the clean queue
// That is mostly so that rebuild works on a alrady clean project
// That is mostly so that rebuild works on a already clean project
setIgnoreReturnValue(m_clean);
QStringList args = m_userArgs;
if (!m_clean) {
......
......@@ -184,8 +184,8 @@ QString Qt4BuildConfiguration::buildDirectory() const
/// returns whether this is a shadow build configuration or not
/// note, even if shadowBuild() returns true, it might be using the
/// source directory as the shadow build directorys, thus not
/// still be a insource build
/// source directory as the shadow build directory, thus it
/// still is a in-source build
bool Qt4BuildConfiguration::shadowBuild() const
{
return m_shadowBuild;
......@@ -391,7 +391,7 @@ bool Qt4BuildConfiguration::compareToImportFrom(const QString &workingDirectory)
// and compare that on its own
QString actualSpec = extractSpecFromArgumentList(qs->userArguments(), workingDirectory, version);
if (actualSpec.isEmpty()) {
// Easy one the user has choosen not to override the settings
// Easy one: the user has chosen not to override the settings
actualSpec = version->mkspec();
}
......