diff --git a/src/plugins/qmakeprojectmanager/externaleditors.cpp b/src/plugins/qmakeprojectmanager/externaleditors.cpp index fc696a303d8594efc4c3dee67d59ace538b02657..2db1e4ad7c3eba60aaa17ce3a82d303ef9804d81 100644 --- a/src/plugins/qmakeprojectmanager/externaleditors.cpp +++ b/src/plugins/qmakeprojectmanager/externaleditors.cpp @@ -51,7 +51,7 @@ enum { debug = 0 }; namespace QmakeProjectManager { namespace Internal { -// Figure out the Qt4 project used by the file if any +// Figure out the qmake project used by the file if any static QmakeProject *qmakeProjectFor(const QString &fileName) { if (ProjectExplorer::Project *baseProject = ProjectExplorer::SessionManager::projectForFile(fileName)) diff --git a/src/plugins/qmakeprojectmanager/makestep.h b/src/plugins/qmakeprojectmanager/makestep.h index 493835a7dff6559547c4c633ead157436a2b0372..0a540888095b7d7cc90ae7c88264d65b1110759d 100644 --- a/src/plugins/qmakeprojectmanager/makestep.h +++ b/src/plugins/qmakeprojectmanager/makestep.h @@ -143,6 +143,6 @@ private: bool m_ignoreChange; }; -} // Qt4ProjectManager +} // QmakeProjectManager #endif // MAKESTEP_H diff --git a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h index 80506f8cc65bfb34199da9e14d698ccd82762244..28e53975b75e3633792d0d9a7f8ca8870d932e09 100644 --- a/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h +++ b/src/plugins/qmakeprojectmanager/qmakebuildconfiguration.h @@ -96,7 +96,7 @@ public: virtual bool isEnabled() const; virtual QString disabledReason() const; - /// \internal For Qt4Project, since that manages the parsing information + /// \internal For QmakeProject, since that manages the parsing information void setEnabled(bool enabled); BuildType buildType() const; diff --git a/src/plugins/qmakeprojectmanager/qmakenodes.cpp b/src/plugins/qmakeprojectmanager/qmakenodes.cpp index eb2eeb507c607ccc03c5a28fe4e89b83483bfcde..51d945d7e794d663967002855b496bd7dfbdf3a7 100644 --- a/src/plugins/qmakeprojectmanager/qmakenodes.cpp +++ b/src/plugins/qmakeprojectmanager/qmakenodes.cpp @@ -1733,7 +1733,7 @@ void QmakeProFileNode::applyEvaluate(EvalResult evalResult, bool async) } if (debug) - qDebug() << "Qt4ProFileNode - updating files for file " << m_projectFilePath; + qDebug() << "QmakeProFileNode - updating files for file " << m_projectFilePath; QmakeProjectType projectType = proFileTemplateTypeToProjectType( (evalResult == EvalOk ? m_readerExact : m_readerCumulative)->templateType()); diff --git a/src/plugins/qmakeprojectmanager/qmakeproject.cpp b/src/plugins/qmakeprojectmanager/qmakeproject.cpp index 7f0fa420e21d1000435f8afbc0be29e58c0f5d95..10179e3f2e297abb4c02e3560b6bb7d1884d6a53 100644 --- a/src/plugins/qmakeprojectmanager/qmakeproject.cpp +++ b/src/plugins/qmakeprojectmanager/qmakeproject.cpp @@ -921,7 +921,7 @@ static FolderNode *folderOf(FolderNode *in, FileType fileType, const QString &fi return 0; } -// Find the Qt4ProFileNode that contains a file of a certain type. +// Find the QmakeProFileNode that contains a file of a certain type. // First recurse down to folder, then find the pro-file. static QmakeProFileNode *proFileNodeOf(QmakeProFileNode *in, FileType fileType, const QString &fileName) { @@ -1392,7 +1392,7 @@ bool QmakeProject::supportsNoTargetPanel() const return true; } -// All the Qt4 run configurations should share code. +// All the Qmake run configurations should share code. // This is a rather suboptimal way to do that for disabledReason() // but more pratical then duplicated the code everywhere QString QmakeProject::disabledReasonForRunConfiguration(const QString &proFilePath) diff --git a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h index 7317b0ca50410be98f0eccb5003496e65c528b1d..3c12284ebf49058154c5256bdd4ed3a45cc19cbd 100644 --- a/src/plugins/qmakeprojectmanager/wizards/qtwizard.h +++ b/src/plugins/qmakeprojectmanager/wizards/qtwizard.h @@ -102,7 +102,7 @@ private: enum { targetPageId = 1 }; }; -/* BaseQt4ProjectWizardDialog: Additionally offers modules page +/* BaseQmakeProjectWizardDialog: Additionally offers modules page * and getter/setter for blank-delimited modules list, transparently * handling the visibility of the modules page list as well as a page * to select targets and Qt versions.