diff --git a/app/kdevideextension.h b/app/kdevideextension.h --- a/app/kdevideextension.h +++ b/app/kdevideextension.h @@ -27,7 +27,7 @@ static void init(); QString xmlFile() override; - QString binaryPath() override; + QString executableFilePath() override; KDevelop::AreaParams defaultArea() override; QString projectFileExtension() override; QString projectFileDescription() override; diff --git a/app/kdevideextension.cpp b/app/kdevideextension.cpp --- a/app/kdevideextension.cpp +++ b/app/kdevideextension.cpp @@ -38,7 +38,7 @@ return "kdevelopui.rc"; } -QString KDevIDEExtension::binaryPath() +QString KDevIDEExtension::executableFilePath() { return QApplication::applicationDirPath() + "/kdevelop"; } diff --git a/app/main.cpp b/app/main.cpp --- a/app/main.cpp +++ b/app/main.cpp @@ -428,7 +428,7 @@ parser.addOption(QCommandLineOption{QStringList{"p", "project"}, i18n("Open KDevelop and load the given project."), "project"}); parser.addOption(QCommandLineOption{QStringList{"d", "debug"}, i18n("Start debugging an application in KDevelop with the given debugger.\n" - "The binary that should be debugged must follow - including arguments.\n" + "The executable that should be debugged must follow - including arguments.\n" "Example: kdevelop --debug gdb myapp --foo bar"), "debugger"}); // this is used by the 'kdevelop!' script to retrieve the pid of a KDEVELOP @@ -558,22 +558,22 @@ if ( parser.isSet("debug") ) { if ( debugArgs.isEmpty() ) { QTextStream qerr(stderr); - qerr << endl << i18nc("@info:shell", "Specify the binary you want to debug.") << endl; + qerr << endl << i18nc("@info:shell", "Specify the executable you want to debug.") << endl; return 1; } - QFileInfo binaryInfo(debugArgs.first()); - if (!binaryInfo.exists()) { - binaryInfo = QStandardPaths::findExecutable(debugArgs.first()); - if (!binaryInfo.exists()) { + QFileInfo executableFileInfo(debugArgs.first()); + if (!executableFileInfo.exists()) { + executableFileInfo = QStandardPaths::findExecutable(debugArgs.first()); + if (!executableFileInfo.exists()) { QTextStream qerr(stderr); - qerr << endl << i18nc("@info:shell", "Specified binary does not exist.") << endl; + qerr << endl << i18nc("@info:shell", "Specified executable does not exist.") << endl; return 1; } } - debugArgs.first() = binaryInfo.absoluteFilePath(); - debugeeName = i18n("Debug %1", binaryInfo.fileName()); + debugArgs.first() = executableFileInfo.absoluteFilePath(); + debugeeName = i18n("Debug %1", executableFileInfo.fileName()); session = debugeeName; } else if ( parser.isSet("new-session") ) { diff --git a/debuggers/common/dialogs/selectcoredialog.h b/debuggers/common/dialogs/selectcoredialog.h --- a/debuggers/common/dialogs/selectcoredialog.h +++ b/debuggers/common/dialogs/selectcoredialog.h @@ -33,7 +33,7 @@ { public: explicit SelectCoreDialog(QWidget *parent = nullptr); - QUrl binary() const; + QUrl executableFile() const; QUrl core() const; private: diff --git a/debuggers/common/dialogs/selectcoredialog.cpp b/debuggers/common/dialogs/selectcoredialog.cpp --- a/debuggers/common/dialogs/selectcoredialog.cpp +++ b/debuggers/common/dialogs/selectcoredialog.cpp @@ -33,9 +33,9 @@ setWindowTitle(i18n("Select Core File")); } -QUrl SelectCoreDialog::binary() const +QUrl SelectCoreDialog::executableFile() const { - return m_ui.binaryFile->url(); + return m_ui.executableFile->url(); } QUrl SelectCoreDialog::core() const diff --git a/debuggers/common/dialogs/selectcoredialog.ui b/debuggers/common/dialogs/selectcoredialog.ui --- a/debuggers/common/dialogs/selectcoredialog.ui +++ b/debuggers/common/dialogs/selectcoredialog.ui @@ -19,7 +19,7 @@ - + diff --git a/debuggers/common/midebugger.h b/debuggers/common/midebugger.h --- a/debuggers/common/midebugger.h +++ b/debuggers/common/midebugger.h @@ -135,7 +135,7 @@ void processLine(const QByteArray& line); protected: - QString debuggerBinary_; + QString debuggerExecutable_; KProcess* process_; MI::MICommand* currentCmd_; diff --git a/debuggers/common/midebugger.cpp b/debuggers/common/midebugger.cpp --- a/debuggers/common/midebugger.cpp +++ b/debuggers/common/midebugger.cpp @@ -328,7 +328,7 @@ i18n("Could not start debugger." "

Could not run '%1'. " "Make sure that the path name is specified correctly.", - debuggerBinary_), + debuggerExecutable_), i18n("Could not start debugger")); emit userCommandOutput("Process failed to start\n"); @@ -341,7 +341,7 @@ "

The debugger process '%1' crashed.
" "Because of that the debug session has to be ended.
" "Try to reproduce the crash without KDevelop and report a bug.
", - debuggerBinary_), + debuggerExecutable_), i18n("Debugger crashed")); emit userCommandOutput("Process crashed\n"); diff --git a/debuggers/common/midebugjobs.cpp b/debuggers/common/midebugjobs.cpp --- a/debuggers/common/midebugjobs.cpp +++ b/debuggers/common/midebugjobs.cpp @@ -172,7 +172,7 @@ return; } - if (!m_session->examineCoreFile(dlg.binary(), dlg.core())) { + if (!m_session->examineCoreFile(dlg.executableFile(), dlg.core())) { done(); } } diff --git a/debuggers/gdb/gdb.cpp b/debuggers/gdb/gdb.cpp --- a/debuggers/gdb/gdb.cpp +++ b/debuggers/gdb/gdb.cpp @@ -53,10 +53,10 @@ // FIXME: verify that default value leads to something sensible QUrl gdbUrl = config.readEntry(Config::GdbPathEntry, QUrl()); if (gdbUrl.isEmpty()) { - debuggerBinary_ = "gdb"; + debuggerExecutable_ = QStringLiteral("gdb"); } else { // FIXME: verify its' a local path. - debuggerBinary_ = gdbUrl.url(QUrl::PreferLocalFile | QUrl::StripTrailingSlash); + debuggerExecutable_ = gdbUrl.url(QUrl::PreferLocalFile | QUrl::StripTrailingSlash); } QStringList arguments = extraArguments; @@ -81,19 +81,19 @@ return false; } - arguments.insert(0, debuggerBinary_); + arguments.insert(0, debuggerExecutable_); arguments.insert(0, shell.toLocalFile()); process_->setShellCommand(KShell::joinArgs(arguments)); } else { - process_->setProgram(debuggerBinary_, arguments); + process_->setProgram(debuggerExecutable_, arguments); } process_->start(); - qCDebug(DEBUGGERGDB) << "Starting GDB with command" << shell.toLocalFile() + ' ' + debuggerBinary_ - + ' ' + arguments.join(' '); + qCDebug(DEBUGGERGDB) << "Starting GDB with command" << shell.toLocalFile() + QLatin1Char(' ') + debuggerExecutable_ + + QLatin1Char(' ') + arguments.join(QLatin1Char(' ')); qCDebug(DEBUGGERGDB) << "GDB process pid:" << process_->pid(); - emit userCommandOutput(shell.toLocalFile() + ' ' + debuggerBinary_ - + ' ' + arguments.join(' ') + '\n'); + emit userCommandOutput(shell.toLocalFile() + QLatin1Char(' ') + debuggerExecutable_ + + QLatin1Char(' ') + arguments.join(QLatin1Char(' ')) + QLatin1Char('\n')); return true; } diff --git a/debuggers/gdb/gdbconfigpage.ui b/debuggers/gdb/gdbconfigpage.ui --- a/debuggers/gdb/gdbconfigpage.ui +++ b/debuggers/gdb/gdbconfigpage.ui @@ -45,7 +45,7 @@ Gdb executable - To run "gdb" binary from $PATH, leave this field empty. To run custom gdb, for example, for a different architecture, enter the executable name here. You can either run gdb from $PATH, but with a different name (say, "arm-gdb"), by typing the name here, or specify full path to the gdb executable. + To run "gdb" executable from $PATH, leave this field empty. To run custom gdb, for example, for a different architecture, enter the executable name here. You can either run gdb from $PATH, but with a different name (say, "arm-gdb"), by typing the name here, or specify full path to the gdb executable. Override path to gdb executable diff --git a/debuggers/lldb/lldbdebugger.cpp b/debuggers/lldb/lldbdebugger.cpp --- a/debuggers/lldb/lldbdebugger.cpp +++ b/debuggers/lldb/lldbdebugger.cpp @@ -51,9 +51,9 @@ // Get path to executable QUrl lldbUrl = config.readEntry(Config::LldbExecutableEntry, QUrl()); if (!lldbUrl.isValid() || !lldbUrl.isLocalFile()) { - debuggerBinary_ = "lldb-mi"; + debuggerExecutable_ = QStringLiteral("lldb-mi"); } else { - debuggerBinary_ = lldbUrl.toLocalFile(); + debuggerExecutable_ = lldbUrl.toLocalFile(); } // Get arguments @@ -74,12 +74,12 @@ // Start! process_->setProcessEnvironment(processEnv); - process_->setProgram(debuggerBinary_, arguments); + process_->setProgram(debuggerExecutable_, arguments); process_->start(); - qCDebug(DEBUGGERLLDB) << "Starting LLDB with command" << debuggerBinary_ + ' ' + arguments.join(' '); + qCDebug(DEBUGGERLLDB) << "Starting LLDB with command" << debuggerExecutable_ + QLatin1Char(' ') + arguments.join(QLatin1Char(' ')); qCDebug(DEBUGGERLLDB) << "LLDB process pid:" << process_->pid(); - emit userCommandOutput(debuggerBinary_ + ' ' + arguments.join(' ') + '\n'); + emit userCommandOutput(debuggerExecutable_ + QLatin1Char(' ') + arguments.join(QLatin1Char(' ')) + QLatin1Char('\n')); return true; } diff --git a/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui b/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui --- a/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui +++ b/languages/plugins/custom-definesandincludes/compilerprovider/widget/compilerswidget.ui @@ -67,7 +67,7 @@ - Compiler path: + Compiler executable: diff --git a/projectbuilders/cmakebuilder/cmakebuilderconfig.kcfg b/projectbuilders/cmakebuilder/cmakebuilderconfig.kcfg --- a/projectbuilders/cmakebuilder/cmakebuilderconfig.kcfg +++ b/projectbuilders/cmakebuilder/cmakebuilderconfig.kcfg @@ -6,7 +6,7 @@ cmakeutils.h - + CMake::findExecutable() The path to the default CMake executable. diff --git a/projectbuilders/cmakebuilder/cmakebuilderpreferences.cpp b/projectbuilders/cmakebuilder/cmakebuilderpreferences.cpp --- a/projectbuilders/cmakebuilder/cmakebuilderpreferences.cpp +++ b/projectbuilders/cmakebuilder/cmakebuilderpreferences.cpp @@ -35,11 +35,11 @@ m_prefsUi->setupUi(this); #ifdef Q_OS_WIN - m_prefsUi->kcfg_cmakeExe->setFilter("*.exe"); + m_prefsUi->kcfg_cmakeExecutable->setFilter(QStringLiteral("*.exe")); #endif - m_prefsUi->kcfg_cmakeExe->setToolTip(CMakeBuilderSettings::self()->cmakeExeItem()->whatsThis()); - m_prefsUi->label1->setToolTip(CMakeBuilderSettings::self()->cmakeExeItem()->whatsThis()); + m_prefsUi->kcfg_cmakeExecutable->setToolTip(CMakeBuilderSettings::self()->cmakeExecutableItem()->whatsThis()); + m_prefsUi->label1->setToolTip(CMakeBuilderSettings::self()->cmakeExecutableItem()->whatsThis()); foreach(const QString& generator, CMakeBuilder::supportedGenerators()) m_prefsUi->kcfg_generator->addItem(generator); diff --git a/projectbuilders/cmakebuilder/cmakebuilderpreferences.ui b/projectbuilders/cmakebuilder/cmakebuilderpreferences.ui --- a/projectbuilders/cmakebuilder/cmakebuilderpreferences.ui +++ b/projectbuilders/cmakebuilder/cmakebuilderpreferences.ui @@ -22,7 +22,7 @@ - + 0 diff --git a/projectbuilders/cmakebuilder/cmakejob.cpp b/projectbuilders/cmakebuilder/cmakejob.cpp --- a/projectbuilders/cmakebuilder/cmakejob.cpp +++ b/projectbuilders/cmakebuilder/cmakejob.cpp @@ -81,7 +81,7 @@ QStringList CMakeJob::commandLine() const { QStringList args; - args << CMake::currentCMakeBinary( m_project ).toLocalFile(); + args << CMake::currentCMakeExecutable(m_project).toLocalFile(); args << "-DCMAKE_EXPORT_COMPILE_COMMANDS=ON"; QString installDir = CMake::currentInstallDir( m_project ).toLocalFile(); diff --git a/projectbuilders/makebuilder/makebuilderconfig.kcfg b/projectbuilders/makebuilder/makebuilderconfig.kcfg --- a/projectbuilders/makebuilder/makebuilderconfig.kcfg +++ b/projectbuilders/makebuilder/makebuilderconfig.kcfg @@ -22,8 +22,9 @@ 2 - - MakeBuilderPreferences::standardMakeCommand() + + + MakeBuilderPreferences::standardMakeExecutable() diff --git a/projectbuilders/makebuilder/makebuilderpreferences.h b/projectbuilders/makebuilder/makebuilderpreferences.h --- a/projectbuilders/makebuilder/makebuilderpreferences.h +++ b/projectbuilders/makebuilder/makebuilderpreferences.h @@ -44,7 +44,7 @@ QString fullName() const override; QIcon icon() const override; - static QString standardMakeCommand(); + static QString standardMakeExecutable(); private: Ui::MakeConfig* m_prefsUi; diff --git a/projectbuilders/makebuilder/makebuilderpreferences.cpp b/projectbuilders/makebuilder/makebuilderpreferences.cpp --- a/projectbuilders/makebuilder/makebuilderpreferences.cpp +++ b/projectbuilders/makebuilder/makebuilderpreferences.cpp @@ -32,9 +32,9 @@ { m_prefsUi = new Ui::MakeConfig; m_prefsUi->setupUi(this); - connect(m_prefsUi->makeBinary, &KUrlRequester::textChanged, + connect(m_prefsUi->makeExecutable, &KUrlRequester::textChanged, this, &MakeBuilderPreferences::changed); - connect(m_prefsUi->makeBinary, &KUrlRequester::urlSelected, + connect(m_prefsUi->makeExecutable, &KUrlRequester::urlSelected, this, &MakeBuilderPreferences::changed); connect(m_prefsUi->configureEnvironment, &EnvironmentConfigureButton::environmentConfigured, this, &MakeBuilderPreferences::changed); @@ -45,30 +45,30 @@ void MakeBuilderPreferences::reset() { ProjectConfigPage::reset(); - QSignalBlocker sigBlock(this); // don't emit changed signal from m_prefsUi->makeBinary - m_prefsUi->makeBinary->setText(MakeBuilderSettings::self()->makeBinary()); + QSignalBlocker sigBlock(this); // don't emit changed signal from m_prefsUi->makeExecutable + m_prefsUi->makeExecutable->setText(MakeBuilderSettings::self()->makeExecutable()); } void MakeBuilderPreferences::apply() { - MakeBuilderSettings::self()->setMakeBinary(m_prefsUi->makeBinary->text()); + MakeBuilderSettings::self()->setMakeExecutable(m_prefsUi->makeExecutable->text()); MakeBuilderSettings::self()->save(); // TODO: is this needed? KConfigDialogManager should end up calling it ProjectConfigPage::apply(); } void MakeBuilderPreferences::defaults() { MakeBuilderSettings::self()->setDefaults(); - m_prefsUi->makeBinary->setText(MakeBuilderSettings::self()->makeBinary()); + m_prefsUi->makeExecutable->setText(MakeBuilderSettings::self()->makeExecutable()); ProjectConfigPage::defaults(); } MakeBuilderPreferences::~MakeBuilderPreferences() { delete m_prefsUi; } -QString MakeBuilderPreferences::standardMakeCommand() +QString MakeBuilderPreferences::standardMakeExecutable() { #ifdef Q_OS_WIN if (!QStandardPaths::findExecutable("make").isEmpty()) diff --git a/projectbuilders/makebuilder/makeconfig.ui b/projectbuilders/makebuilder/makeconfig.ui --- a/projectbuilders/makebuilder/makeconfig.ui +++ b/projectbuilders/makebuilder/makeconfig.ui @@ -147,12 +147,12 @@ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - makeBinary + makeExecutable - + 0 diff --git a/projectbuilders/makebuilder/makejob.cpp b/projectbuilders/makebuilder/makejob.cpp --- a/projectbuilders/makebuilder/makejob.cpp +++ b/projectbuilders/makebuilder/makejob.cpp @@ -206,7 +206,8 @@ KSharedConfigPtr configPtr = it->project()->projectConfiguration(); KConfigGroup builderGroup( configPtr, "MakeBuilder" ); - QString makeBin = builderGroup.readEntry("Make Binary", MakeBuilderPreferences::standardMakeCommand()); + // TODO: migrate to more generic key term "Make Executable" + QString makeBin = builderGroup.readEntry("Make Binary", MakeBuilderPreferences::standardMakeExecutable()); cmdline << makeBin; if( ! builderGroup.readEntry("Abort on First Error", true)) diff --git a/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp b/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp --- a/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp +++ b/projectbuilders/ninjabuilder/kdevninjabuilderplugin.cpp @@ -37,7 +37,7 @@ KDevNinjaBuilderPlugin::KDevNinjaBuilderPlugin(QObject* parent, const QVariantList& ) : KDevelop::IPlugin("kdevninja", parent) { - if(NinjaJob::ninjaBinary().isEmpty()) { + if(NinjaJob::ninjaExecutable().isEmpty()) { setErrorDescription(i18n("Unable to find ninja executable. Is it installed on the system?")); } } diff --git a/projectbuilders/ninjabuilder/ninjajob.h b/projectbuilders/ninjabuilder/ninjajob.h --- a/projectbuilders/ninjabuilder/ninjajob.h +++ b/projectbuilders/ninjabuilder/ninjajob.h @@ -43,7 +43,7 @@ NinjaJob( KDevelop::ProjectBaseItem* item, const QStringList& arguments, const QByteArray& signal, KDevNinjaBuilderPlugin* parent ); void setIsInstalling( bool isInstalling ); - static QString ninjaBinary(); + static QString ninjaExecutable(); KDevelop::ProjectBaseItem* item() const; diff --git a/projectbuilders/ninjabuilder/ninjajob.cpp b/projectbuilders/ninjabuilder/ninjajob.cpp --- a/projectbuilders/ninjabuilder/ninjajob.cpp +++ b/projectbuilders/ninjabuilder/ninjajob.cpp @@ -87,7 +87,7 @@ // hardcode the ninja output format so we can parse it reliably addEnvironmentOverride(QStringLiteral("NINJA_STATUS"), QStringLiteral("[%s/%t] ")); - *this << ninjaBinary(); + *this << ninjaExecutable(); *this << arguments; QStringList targets; @@ -111,7 +111,7 @@ m_isInstalling = isInstalling; } -QString NinjaJob::ninjaBinary() +QString NinjaJob::ninjaExecutable() { QString path = QStandardPaths::findExecutable("ninja-build"); if (path.isEmpty()) { diff --git a/projectbuilders/qmakebuilder/qmakejob.cpp b/projectbuilders/qmakebuilder/qmakejob.cpp --- a/projectbuilders/qmakebuilder/qmakejob.cpp +++ b/projectbuilders/qmakebuilder/qmakejob.cpp @@ -80,7 +80,7 @@ } QStringList args; - args << QMakeConfig::qmakeBinary(m_project); + args << QMakeConfig::qmakeExecutable(m_project); args << m_project->path().toUrl().toLocalFile(); diff --git a/projectmanagers/cmake/cmakebuilddirchooser.h b/projectmanagers/cmake/cmakebuilddirchooser.h --- a/projectmanagers/cmake/cmakebuilddirchooser.h +++ b/projectmanagers/cmake/cmakebuilddirchooser.h @@ -53,13 +53,13 @@ explicit CMakeBuildDirChooser(QWidget* parent = nullptr); ~CMakeBuildDirChooser() override; - KDevelop::Path cmakeBinary() const; + KDevelop::Path cmakeExecutable() const; KDevelop::Path installPrefix() const; KDevelop::Path buildFolder() const; QString buildType() const; QString extraArguments() const; - void setCMakeBinary(const KDevelop::Path& path); + void setCMakeExecutable(const KDevelop::Path& path); void setInstallPrefix(const KDevelop::Path& path); void setBuildFolder(const KDevelop::Path& path); void setBuildType(const QString& buildType); diff --git a/projectmanagers/cmake/cmakebuilddirchooser.cpp b/projectmanagers/cmake/cmakebuilddirchooser.cpp --- a/projectmanagers/cmake/cmakebuilddirchooser.cpp +++ b/projectmanagers/cmake/cmakebuilddirchooser.cpp @@ -59,11 +59,11 @@ m_chooserUi->buildFolder->setMode(KFile::Directory|KFile::ExistingOnly); m_chooserUi->installPrefix->setMode(KFile::Directory|KFile::ExistingOnly); - setCMakeBinary(Path(CMake::findExecutable())); + setCMakeExecutable(Path(CMake::findExecutable())); m_extraArgumentsHistory = new CMakeExtraArgumentsHistory(m_chooserUi->extraArguments); - connect(m_chooserUi->cmakeBin, &KUrlRequester::textChanged, this, &CMakeBuildDirChooser::updated); + connect(m_chooserUi->cmakeExecutable, &KUrlRequester::textChanged, this, &CMakeBuildDirChooser::updated); connect(m_chooserUi->buildFolder, &KUrlRequester::textChanged, this, &CMakeBuildDirChooser::updated); connect(m_chooserUi->buildType, static_cast(&QComboBox::currentIndexChanged), this, &CMakeBuildDirChooser::updated); connect(m_chooserUi->extraArguments, &KComboBox::editTextChanged, this, &CMakeBuildDirChooser::updated); @@ -142,7 +142,7 @@ void CMakeBuildDirChooser::updated() { - bool haveCMake=QFile::exists(m_chooserUi->cmakeBin->url().toLocalFile()); + bool haveCMake=QFile::exists(m_chooserUi->cmakeExecutable->url().toLocalFile()); StatusTypes st; if( haveCMake ) st |= HaveCMake; @@ -152,7 +152,7 @@ // m_chooserUi->generator->setEnabled(haveCMake); if(!haveCMake) { - setStatus(i18n("You need to select a cmake binary."), false); + setStatus(i18n("You need to select a CMake executable."), false); return; } @@ -244,9 +244,9 @@ } } -void CMakeBuildDirChooser::setCMakeBinary(const Path& path) +void CMakeBuildDirChooser::setCMakeExecutable(const Path& path) { - m_chooserUi->cmakeBin->setUrl(path.toUrl()); + m_chooserUi->cmakeExecutable->setUrl(path.toUrl()); updated(); } @@ -300,7 +300,7 @@ } } -Path CMakeBuildDirChooser::cmakeBinary() const { return Path(m_chooserUi->cmakeBin->url()); } +Path CMakeBuildDirChooser::cmakeExecutable() const { return Path(m_chooserUi->cmakeExecutable->url()); } Path CMakeBuildDirChooser::installPrefix() const { return Path(m_chooserUi->installPrefix->url()); } diff --git a/projectmanagers/cmake/cmakebuilddirchooser.ui b/projectmanagers/cmake/cmakebuilddirchooser.ui --- a/projectmanagers/cmake/cmakebuilddirchooser.ui +++ b/projectmanagers/cmake/cmakebuilddirchooser.ui @@ -26,18 +26,18 @@ - CMake &Binary: + CMake &executable: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - cmakeBin + cmakeExecutable - + 0 diff --git a/projectmanagers/cmake/cmakedocumentation.h b/projectmanagers/cmake/cmakedocumentation.h --- a/projectmanagers/cmake/cmakedocumentation.h +++ b/projectmanagers/cmake/cmakedocumentation.h @@ -65,7 +65,7 @@ void collectIds(const QString& param, Type type); QMap m_typeForName; - const QString mCMakeCmd; + const QString m_cmakeExecutable; QStringListModel* m_index; }; diff --git a/projectmanagers/cmake/cmakedocumentation.cpp b/projectmanagers/cmake/cmakedocumentation.cpp --- a/projectmanagers/cmake/cmakedocumentation.cpp +++ b/projectmanagers/cmake/cmakedocumentation.cpp @@ -49,11 +49,11 @@ CMakeDocumentation::CMakeDocumentation(QObject* parent, const QVariantList&) : KDevelop::IPlugin( "kdevcmakedocumentation", parent ) - , mCMakeCmd(CMake::findExecutable()) + , m_cmakeExecutable(CMake::findExecutable()) , m_index(nullptr) { - if (mCMakeCmd.isEmpty()) { - setErrorDescription(i18n("Unable to find cmake executable. Is it installed on the system?") ); + if (m_cmakeExecutable.isEmpty()) { + setErrorDescription(i18n("Unable to find a CMake executable. Is one installed on the system?")); return; } @@ -75,7 +75,7 @@ void CMakeDocumentation::collectIds(const QString& param, Type type) { - QStringList ids=CMake::executeProcess(mCMakeCmd, QStringList(param)).split('\n'); + QStringList ids = CMake::executeProcess(m_cmakeExecutable, QStringList(param)).split(QLatin1Char('\n')); ids.takeFirst(); foreach(const QString& name, ids) { @@ -92,7 +92,7 @@ { QString desc; if(args[t]) { - desc = CMake::executeProcess(mCMakeCmd, { args[t], id.simplified() }); + desc = CMake::executeProcess(m_cmakeExecutable, { args[t], id.simplified() }); desc = desc.remove(":ref:"); const QString rst2html = QStandardPaths::findExecutable(QStringLiteral("rst2html")); diff --git a/projectmanagers/cmake/cmakemanager.cpp b/projectmanagers/cmake/cmakemanager.cpp --- a/projectmanagers/cmake/cmakemanager.cpp +++ b/projectmanagers/cmake/cmakemanager.cpp @@ -85,7 +85,7 @@ , m_filter( new ProjectFilterManager( this ) ) { if (CMake::findExecutable().isEmpty()) { - setErrorDescription(i18n("Unable to find cmake executable. Is it installed on the system?")); + setErrorDescription(i18n("Unable to find a CMake executable. Is one installed on the system?")); m_highlight = nullptr; return; } diff --git a/projectmanagers/cmake/cmakeutils.h b/projectmanagers/cmake/cmakeutils.h --- a/projectmanagers/cmake/cmakeutils.h +++ b/projectmanagers/cmake/cmakeutils.h @@ -70,15 +70,15 @@ KDEVCMAKECOMMON_EXPORT QString currentBuildType( KDevelop::IProject* project ); /** - * @returns the cmake executable, taking into account standard + * @returns the CMake executable, taking into account standard * installation dirs on Windows, or empty string in case of failure. */ KDEVCMAKECOMMON_EXPORT QString findExecutable(); /** - * @returns the current cmake binary for the given project or + * @returns the current CMake executable for the given project or * QStandardPaths::findExecutable("cmake") as default value. */ - KDEVCMAKECOMMON_EXPORT KDevelop::Path currentCMakeBinary( KDevelop::IProject* project ); + KDEVCMAKECOMMON_EXPORT KDevelop::Path currentCMakeExecutable(KDevelop::IProject* project); /** * @returns the current install dir for the given project or "/usr/local" as default value. @@ -126,9 +126,9 @@ KDEVCMAKECOMMON_EXPORT void setCurrentBuildType( KDevelop::IProject* project, const QString& type ); /** - * Sets the current cmake binary for the given project. + * Sets the current CMake executable for the given project. */ - KDEVCMAKECOMMON_EXPORT void setCurrentCMakeBinary( KDevelop::IProject* project, const KDevelop::Path &path ); + KDEVCMAKECOMMON_EXPORT void setCurrentCMakeExecutable(KDevelop::IProject* project, const KDevelop::Path& path); /** * Sets the current build dir for the given project. diff --git a/projectmanagers/cmake/cmakeutils.cpp b/projectmanagers/cmake/cmakeutils.cpp --- a/projectmanagers/cmake/cmakeutils.cpp +++ b/projectmanagers/cmake/cmakeutils.cpp @@ -66,7 +66,8 @@ namespace Specific { static const QString buildDirPathKey = "Build Directory Path"; -static const QString cmakeBinKey = "CMake Binary"; +// TODO: migrate to more generic & consistent key term "CMake Executable" +static const QString cmakeExecutableKey = "CMake Binary"; static const QString cmakeBuildTypeKey = "Build Type"; static const QString cmakeInstallDirKey = "Install Directory"; static const QString cmakeEnvironmentKey = "Environment Profile"; @@ -193,7 +194,7 @@ bd.setSourceFolder( folder ); bd.setAlreadyUsed( CMake::allBuildDirs(project) ); - bd.setCMakeBinary( currentCMakeBinary(project) ); + bd.setCMakeExecutable(currentCMakeExecutable(project)); if( !bd.exec() ) { @@ -210,15 +211,15 @@ qCDebug(CMAKE) << "adding to cmake config: installdir " << bd.installPrefix(); qCDebug(CMAKE) << "adding to cmake config: extra args" << bd.extraArguments(); qCDebug(CMAKE) << "adding to cmake config: build type " << bd.buildType(); - qCDebug(CMAKE) << "adding to cmake config: cmake binary " << bd.cmakeBinary(); + qCDebug(CMAKE) << "adding to cmake config: cmake executable " << bd.cmakeExecutable(); qCDebug(CMAKE) << "adding to cmake config: environment "; CMake::setBuildDirCount( project, addedBuildDirIndex + 1 ); CMake::setCurrentBuildDirIndex( project, addedBuildDirIndex ); CMake::setCurrentBuildDir( project, bd.buildFolder() ); CMake::setCurrentInstallDir( project, bd.installPrefix() ); CMake::setCurrentExtraArguments( project, bd.extraArguments() ); CMake::setCurrentBuildType( project, bd.buildType() ); - CMake::setCurrentCMakeBinary( project, bd.cmakeBinary() ); + CMake::setCurrentCMakeExecutable(project, bd.cmakeExecutable()); CMake::setCurrentEnvironment( project, QString() ); return true; @@ -308,14 +309,14 @@ return cmake; } -KDevelop::Path currentCMakeBinary( KDevelop::IProject* project ) +KDevelop::Path currentCMakeExecutable(KDevelop::IProject* project) { - const auto systemBinary = findExecutable(); - auto path = readProjectParameter( project, Config::Specific::cmakeBinKey, systemBinary ); - if (path != systemBinary) { + const auto systemExecutable = findExecutable(); + auto path = readProjectParameter(project, Config::Specific::cmakeExecutableKey, systemExecutable); + if (path != systemExecutable) { QFileInfo info(path); if (!info.isExecutable()) { - path = systemBinary; + path = systemExecutable; } } return KDevelop::Path(path); @@ -351,9 +352,9 @@ writeProjectParameter( project, Config::Specific::cmakeBuildTypeKey, type ); } -void setCurrentCMakeBinary( KDevelop::IProject* project, const KDevelop::Path& path ) +void setCurrentCMakeExecutable(KDevelop::IProject* project, const KDevelop::Path& path) { - writeProjectParameter( project, Config::Specific::cmakeBinKey, path.toLocalFile() ); + writeProjectParameter(project, Config::Specific::cmakeExecutableKey, path.toLocalFile()); } void setCurrentBuildDir( KDevelop::IProject* project, const KDevelop::Path& path ) @@ -454,7 +455,7 @@ const KDevelop::Path cacheFilePath( builddir, QStringLiteral("CMakeCache.txt")); QFile file(cacheFilePath.toLocalFile()); const QMap keys = { - { Config::Specific::cmakeBinKey, QStringLiteral("CMAKE_COMMAND") }, + { Config::Specific::cmakeExecutableKey, QStringLiteral("CMAKE_COMMAND") }, { Config::Specific::cmakeInstallDirKey, QStringLiteral("CMAKE_INSTALL_PREFIX") }, { Config::Specific::cmakeBuildTypeKey, QStringLiteral("CMAKE_BUILD_TYPE") } }; diff --git a/projectmanagers/cmake/settings/cmakebuildsettings.ui b/projectmanagers/cmake/settings/cmakebuildsettings.ui --- a/projectmanagers/cmake/settings/cmakebuildsettings.ui +++ b/projectmanagers/cmake/settings/cmakebuildsettings.ui @@ -212,12 +212,12 @@ - + - + - CMake Binary: + CMake executable: diff --git a/projectmanagers/cmake/settings/cmakepreferences.cpp b/projectmanagers/cmake/settings/cmakepreferences.cpp --- a/projectmanagers/cmake/settings/cmakepreferences.cpp +++ b/projectmanagers/cmake/settings/cmakepreferences.cpp @@ -92,7 +92,7 @@ this, &CMakePreferences::changed); connect(m_prefsUi->extraArguments, &KComboBox::editTextChanged, this, &CMakePreferences::changed); - connect(m_prefsUi->cMakeBinary, &KUrlRequester::textChanged, + connect(m_prefsUi->cMakeExecutable, &KUrlRequester::textChanged, this, &CMakePreferences::changed); showInternal(m_prefsUi->showInternal->checkState()); @@ -128,7 +128,7 @@ } m_prefsUi->buildType->setCurrentIndex(m_prefsUi->buildType->findText(buildType)); m_prefsUi->extraArguments->setEditText(CMake::currentExtraArguments(m_project)); - m_prefsUi->cMakeBinary->setText(CMake::currentCMakeBinary(m_project).toLocalFile()); + m_prefsUi->cMakeExecutable->setText(CMake::currentCMakeExecutable(m_project).toLocalFile()); } void CMakePreferences::reset() @@ -171,13 +171,13 @@ } CMake::setCurrentBuildType( m_project, buildType ); CMake::setCurrentExtraArguments( m_project, m_prefsUi->extraArguments->currentText() ); - CMake::setCurrentCMakeBinary( m_project, Path(m_prefsUi->cMakeBinary->text()) ); + CMake::setCurrentCMakeExecutable(m_project, Path(m_prefsUi->cMakeExecutable->text())); qCDebug(CMAKE) << "writing to cmake config: using builddir " << CMake::currentBuildDirIndex(m_project); qCDebug(CMAKE) << "writing to cmake config: builddir path " << CMake::currentBuildDir(m_project); qCDebug(CMAKE) << "writing to cmake config: installdir " << CMake::currentInstallDir(m_project); qCDebug(CMAKE) << "writing to cmake config: build type " << CMake::currentBuildType(m_project); - qCDebug(CMAKE) << "writing to cmake config: cmake binary " << CMake::currentCMakeBinary(m_project); + qCDebug(CMAKE) << "writing to cmake config: cmake executable " << CMake::currentCMakeExecutable(m_project); qCDebug(CMAKE) << "writing to cmake config: environment " << CMake::currentEnvironment(m_project); //We run cmake on the builddir to generate it @@ -296,7 +296,7 @@ // It may be '/' or '\', so maybe should we rely on CMake::allBuildDirs() for returning well-formed paths? QStringList used = CMake::allBuildDirs( m_project ); bdCreator.setAlreadyUsed(used); - bdCreator.setCMakeBinary(Path(CMake::findExecutable())); + bdCreator.setCMakeExecutable(Path(CMake::findExecutable())); if(bdCreator.exec()) { @@ -309,15 +309,15 @@ qCDebug(CMAKE) << "adding to cmake config: installdir " << bdCreator.installPrefix(); qCDebug(CMAKE) << "adding to cmake config: extra args" << bdCreator.extraArguments(); qCDebug(CMAKE) << "adding to cmake config: build type " << bdCreator.buildType(); - qCDebug(CMAKE) << "adding to cmake config: cmake binary " << bdCreator.cmakeBinary(); + qCDebug(CMAKE) << "adding to cmake config: cmake executable " << bdCreator.cmakeExecutable(); qCDebug(CMAKE) << "adding to cmake config: environment empty"; CMake::setOverrideBuildDirIndex( m_project, addedBuildDirIndex ); CMake::setBuildDirCount( m_project, addedBuildDirIndex + 1 ); CMake::setCurrentBuildDir( m_project, bdCreator.buildFolder() ); CMake::setCurrentInstallDir( m_project, bdCreator.installPrefix() ); CMake::setCurrentExtraArguments( m_project, bdCreator.extraArguments() ); CMake::setCurrentBuildType( m_project, bdCreator.buildType() ); - CMake::setCurrentCMakeBinary( m_project, bdCreator.cmakeBinary() ); + CMake::setCurrentCMakeExecutable(m_project, bdCreator.cmakeExecutable()); CMake::setCurrentEnvironment( m_project, QString() ); QString newbuilddir = bdCreator.buildFolder().toLocalFile(); @@ -358,7 +358,7 @@ qCDebug(CMAKE) << "removing from cmake config: installdir " << CMake::currentInstallDir( m_project ); qCDebug(CMAKE) << "removing from cmake config: extra args" << CMake::currentExtraArguments( m_project ); qCDebug(CMAKE) << "removing from cmake config: buildtype " << CMake::currentBuildType( m_project ); - qCDebug(CMAKE) << "removing from cmake config: cmake binary " << CMake::currentCMakeBinary( m_project ); + qCDebug(CMAKE) << "removing from cmake config: cmake executable " << CMake::currentCMakeExecutable(m_project); qCDebug(CMAKE) << "removing from cmake config: environment " << CMake::currentEnvironment( m_project ); CMake::removeBuildDirConfig(m_project); diff --git a/projectmanagers/cmake/tests/testhelpers.h b/projectmanagers/cmake/tests/testhelpers.h --- a/projectmanagers/cmake/tests/testhelpers.h +++ b/projectmanagers/cmake/tests/testhelpers.h @@ -33,7 +33,7 @@ #include static QString currentBuildDirKey = "Build Directory Path"; -static QString currentCMakeBinaryKey = "CMake Binary"; +static QString currentCMakeExecutableKey = "CMake Binary"; static QString currentBuildTypeKey = "Build Type"; static QString currentInstallDirKey = "Install Directory"; static QString currentExtraArgumentsKey = "Extra Arguments"; @@ -110,7 +110,7 @@ KConfigGroup buildDirGrp = cmakeGrp.group(QStringLiteral("CMake Build Directory 0")); buildDirGrp.writeEntry( currentBuildDirKey, bd.buildFolder().toLocalFile() ); - buildDirGrp.writeEntry( currentCMakeBinaryKey, bd.cmakeBinary().toLocalFile() ); + buildDirGrp.writeEntry(currentCMakeExecutableKey, bd.cmakeExecutable().toLocalFile()); buildDirGrp.writeEntry( currentInstallDirKey, bd.installPrefix().toLocalFile() ); buildDirGrp.writeEntry( currentExtraArgumentsKey, bd.extraArguments() ); buildDirGrp.writeEntry( currentBuildTypeKey, bd.buildType() ); diff --git a/projectmanagers/qmake/qmakebuilddirchooser.h b/projectmanagers/qmake/qmakebuilddirchooser.h --- a/projectmanagers/qmake/qmakebuilddirchooser.h +++ b/projectmanagers/qmake/qmakebuilddirchooser.h @@ -74,13 +74,13 @@ QString errorString() const; - QString qmakeBin() const; + QString qmakeExecutable() const; QString buildDir() const; QString installPrefix() const; int buildType() const; QString extraArgs() const; - void setQMakeBin(const QString &binary); + void setQMakeExecutable(const QString& executable); void setBuildDir(const QString &buildDir); void setInstallPrefix(const QString &prefix); void setBuildType(int type); diff --git a/projectmanagers/qmake/qmakebuilddirchooser.cpp b/projectmanagers/qmake/qmakebuilddirchooser.cpp --- a/projectmanagers/qmake/qmakebuilddirchooser.cpp +++ b/projectmanagers/qmake/qmakebuilddirchooser.cpp @@ -56,9 +56,9 @@ kcfg_buildDir->setMode(KFile::Directory | KFile::LocalOnly); kcfg_installPrefix->setMode(KFile::Directory | KFile::LocalOnly); - kcfg_qmakeBin->setMode(KFile::File | KFile::ExistingOnly | KFile::LocalOnly); + kcfg_qmakeExecutable->setMode(KFile::File | KFile::ExistingOnly | KFile::LocalOnly); - connect(kcfg_qmakeBin, &KUrlRequester::textChanged, this, &QMakeBuildDirChooser::changed); + connect(kcfg_qmakeExecutable, &KUrlRequester::textChanged, this, &QMakeBuildDirChooser::changed); connect(kcfg_buildDir, &KUrlRequester::textChanged, this, &QMakeBuildDirChooser::changed); connect(kcfg_installPrefix, &KUrlRequester::textChanged, this, &QMakeBuildDirChooser::changed); connect(kcfg_buildType, static_cast(&QComboBox::currentIndexChanged), this, @@ -102,7 +102,7 @@ { qCDebug(KDEV_QMAKE) << "Writing config for" << buildDir() << "to config" << config.name(); - config.writeEntry(QMakeConfig::QMAKE_BINARY, qmakeBin()); + config.writeEntry(QMakeConfig::QMAKE_EXECUTABLE, qmakeExecutable()); config.writeEntry(QMakeConfig::INSTALL_PREFIX, installPrefix()); config.writeEntry(QMakeConfig::EXTRA_ARGUMENTS, extraArgs()); config.writeEntry(QMakeConfig::BUILD_TYPE, buildType()); @@ -125,7 +125,7 @@ QSignalBlocker blocker(this); // only emit changed once // sets values into fields - setQMakeBin(QMakeConfig::qmakeBinary(m_project)); + setQMakeExecutable(QMakeConfig::qmakeExecutable(m_project)); setBuildDir(config); setInstallPrefix(build.readEntry(QMakeConfig::INSTALL_PREFIX, QString())); setExtraArgs(build.readEntry(QMakeConfig::EXTRA_ARGUMENTS, QString())); @@ -138,27 +138,27 @@ { bool valid = true; QString msg; - if (qmakeBin().isEmpty()) { - msg = i18n("Please specify path to QMake binary."); + if (qmakeExecutable().isEmpty()) { + msg = i18n("Please specify path to QMake executable."); valid = false; } else { - QFileInfo info(qmakeBin()); + QFileInfo info(qmakeExecutable()); if (!info.exists()) { - msg = i18n("QMake binary \"%1\" does not exist.", qmakeBin()); + msg = i18n("QMake executable \"%1\" does not exist.", qmakeExecutable()); valid = false; } else if (!info.isFile()) { - msg = i18n("QMake binary is not a file."); + msg = i18n("QMake executable is not a file."); valid = false; } else if (!info.isExecutable()) { - msg = i18n("QMake binary is not executable."); + msg = i18n("QMake executable is not executable."); valid = false; } else { const QHash vars = QMakeConfig::queryQMake(info.absoluteFilePath()); if (vars.isEmpty()) { - msg = i18n("QMake binary cannot be queried for variables."); + msg = i18n("QMake executable cannot be queried for variables."); valid = false; } else if (QMakeConfig::findBasicMkSpec(vars).isEmpty()) { - msg = i18n("No basic MkSpec file could be found for the given QMake binary."); + msg = i18n("No basic MkSpec file could be found for the given QMake executable."); valid = false; } } @@ -176,9 +176,9 @@ return valid; } -QString QMakeBuildDirChooser::qmakeBin() const +QString QMakeBuildDirChooser::qmakeExecutable() const { - return kcfg_qmakeBin->url().toLocalFile(); + return kcfg_qmakeExecutable->url().toLocalFile(); } QString QMakeBuildDirChooser::buildDir() const @@ -201,9 +201,9 @@ return kcfg_extraArgs->text(); } -void QMakeBuildDirChooser::setQMakeBin(const QString& binary) +void QMakeBuildDirChooser::setQMakeExecutable(const QString& executable) { - kcfg_qmakeBin->setUrl(QUrl::fromLocalFile(binary)); + kcfg_qmakeExecutable->setUrl(QUrl::fromLocalFile(executable)); } void QMakeBuildDirChooser::setBuildDir(const QString& buildDir) diff --git a/projectmanagers/qmake/qmakebuilddirchooser.ui b/projectmanagers/qmake/qmakebuilddirchooser.ui --- a/projectmanagers/qmake/qmakebuilddirchooser.ui +++ b/projectmanagers/qmake/qmakebuilddirchooser.ui @@ -26,18 +26,18 @@ - QMake &binary: + QMake &executable: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - kcfg_qmakeBin + kcfg_qmakeExecutable - + 0 @@ -158,7 +158,7 @@ - kcfg_qmakeBin + kcfg_qmakeExecutable kcfg_buildDir kcfg_installPrefix kcfg_buildType diff --git a/projectmanagers/qmake/qmakebuilddirchooserdialog.cpp b/projectmanagers/qmake/qmakebuilddirchooserdialog.cpp --- a/projectmanagers/qmake/qmakebuilddirchooserdialog.cpp +++ b/projectmanagers/qmake/qmakebuilddirchooserdialog.cpp @@ -52,7 +52,7 @@ mainLayout->addWidget(m_buttonBox); loadConfig(); - // save; like this, we can be sure to have a qmake binary and build path set + // save; like this, we can be sure to have a qmake executable and build path set //(even if user clicks Cancel) saveConfig(); diff --git a/projectmanagers/qmake/qmakeconfig.h b/projectmanagers/qmake/qmakeconfig.h --- a/projectmanagers/qmake/qmakeconfig.h +++ b/projectmanagers/qmake/qmakeconfig.h @@ -33,7 +33,7 @@ static const char *CONFIG_GROUP; static const char - *QMAKE_BINARY, + *QMAKE_EXECUTABLE, *BUILD_FOLDER, *INSTALL_PREFIX, *EXTRA_ARGUMENTS, @@ -52,14 +52,14 @@ static KDevelop::Path buildDirFromSrc(const KDevelop::IProject* project, const KDevelop::Path& srcDir); /** - * Returns the QMake binary configured for the given @p project. + * Returns the QMake executable configured for the given @p project. */ - static QString qmakeBinary(const KDevelop::IProject* project); + static QString qmakeExecutable(const KDevelop::IProject* project); /** * Query QMake and return the thus obtained QMake variables. */ - static QHash queryQMake(const QString& qmakeBinary, const QStringList& args = {}); + static QHash queryQMake(const QString& qmakeExecutable, const QStringList& args = {}); /** * Given the QMake variables, try to find a basic MkSpec. diff --git a/projectmanagers/qmake/qmakeconfig.cpp b/projectmanagers/qmake/qmakeconfig.cpp --- a/projectmanagers/qmake/qmakeconfig.cpp +++ b/projectmanagers/qmake/qmakeconfig.cpp @@ -32,7 +32,8 @@ const char* QMakeConfig::CONFIG_GROUP = "QMake_Builder"; -const char* QMakeConfig::QMAKE_BINARY = "QMake_Binary"; + // TODO: migrate to more generic & consistent key term "QMake_Executable" +const char* QMakeConfig::QMAKE_EXECUTABLE = "QMake_Binary"; const char* QMakeConfig::BUILD_FOLDER = "Build_Folder"; const char* QMakeConfig::INSTALL_PREFIX = "Install_Prefix"; const char* QMakeConfig::EXTRA_ARGUMENTS = "Extra_Arguments"; @@ -61,7 +62,7 @@ { QMutexLocker lock(&s_buildDirMutex); KConfigGroup cg(project->projectConfiguration(), CONFIG_GROUP); - return cg.exists() && cg.hasKey(QMAKE_BINARY) && cg.hasKey(BUILD_FOLDER); + return cg.exists() && cg.hasKey(QMAKE_EXECUTABLE) && cg.hasKey(BUILD_FOLDER); } Path QMakeConfig::buildDirFromSrc(const IProject* project, const Path& srcDir) @@ -77,15 +78,15 @@ return buildDir; } -QString QMakeConfig::qmakeBinary(const IProject* project) +QString QMakeConfig::qmakeExecutable(const IProject* project) { QMutexLocker lock(&s_buildDirMutex); QString exe; if (project) { KSharedConfig::Ptr cfg = project->projectConfiguration(); KConfigGroup group(cfg.data(), CONFIG_GROUP); - if (group.hasKey(QMAKE_BINARY)) { - exe = group.readEntry(QMAKE_BINARY, QString()); + if (group.hasKey(QMAKE_EXECUTABLE)) { + exe = group.readEntry(QMAKE_EXECUTABLE, QString()); QFileInfo info(exe); if (!info.exists() || !info.isExecutable()) { qWarning() << "bad QMake configured for project " << project->path().toUrl() << ":" << exe; @@ -106,12 +107,12 @@ return exe; } -QHash QMakeConfig::queryQMake(const QString& qmakeBinary, const QStringList& args) +QHash QMakeConfig::queryQMake(const QString& qmakeExecutable, const QStringList& args) { QHash hash; KProcess p; p.setOutputChannelMode(KProcess::OnlyStdoutChannel); - p << qmakeBinary << "-query" << args; + p << qmakeExecutable << QStringLiteral("-query") << args; const int rc = p.execute(); if (rc != 0) { diff --git a/projectmanagers/qmake/qmakemanager.cpp b/projectmanagers/qmake/qmakemanager.cpp --- a/projectmanagers/qmake/qmakemanager.cpp +++ b/projectmanagers/qmake/qmakemanager.cpp @@ -504,7 +504,7 @@ Path buildDir = QMakeConfig::buildDirFromSrc(m_actionItem->project(), srcDir); QMakeJob* job = new QMakeJob(srcDir.toLocalFile(), buildDir.toLocalFile(), this); - job->setQMakePath(QMakeConfig::qmakeBinary(m_actionItem->project())); + job->setQMakePath(QMakeConfig::qmakeExecutable(m_actionItem->project())); KConfigGroup cg(m_actionItem->project()->projectConfiguration(), QMakeConfig::CONFIG_GROUP); QString installPrefix = cg.readEntry(QMakeConfig::INSTALL_PREFIX, QString()); diff --git a/projectmanagers/qmake/qmakeprojectfile.cpp b/projectmanagers/qmake/qmakeprojectfile.cpp --- a/projectmanagers/qmake/qmakeprojectfile.cpp +++ b/projectmanagers/qmake/qmakeprojectfile.cpp @@ -104,16 +104,16 @@ const QString qtVersion = QStringLiteral("QT_VERSION"); const QString qtInstallLibs = QStringLiteral("QT_INSTALL_LIBS"); - const QString binary = QMakeConfig::qmakeBinary(project()); - if (!m_qmakeQueryCache.contains(binary)) { - const auto queryResult = QMakeConfig::queryQMake(binary, {qtInstallHeaders, qtVersion, qtInstallLibs}); + const QString executable = QMakeConfig::qmakeExecutable(project()); + if (!m_qmakeQueryCache.contains(executable)) { + const auto queryResult = QMakeConfig::queryQMake(executable, {qtInstallHeaders, qtVersion, qtInstallLibs}); if (queryResult.isEmpty()) { - qCWarning(KDEV_QMAKE) << "Failed to query qmake - bad qmake binary configured?" << binary; + qCWarning(KDEV_QMAKE) << "Failed to query qmake - bad qmake executable configured?" << executable; } - m_qmakeQueryCache[binary] = queryResult; + m_qmakeQueryCache[executable] = queryResult; } - const auto cachedQueryResult = m_qmakeQueryCache.value(binary); + const auto cachedQueryResult = m_qmakeQueryCache.value(executable); m_qtIncludeDir = cachedQueryResult.value(qtInstallHeaders); m_qtVersion = cachedQueryResult.value(qtVersion); m_qtLibDir = cachedQueryResult.value(qtInstallLibs); diff --git a/projectmanagers/qmake/qmakeutils.cpp b/projectmanagers/qmake/qmakeutils.cpp --- a/projectmanagers/qmake/qmakeutils.cpp +++ b/projectmanagers/qmake/qmakeutils.cpp @@ -52,8 +52,8 @@ if (!QMakeConfig::isConfigured(project)) { return true; } - const QString qmakeBinary = QMakeConfig::qmakeBinary(project); - if (qmakeBinary.isEmpty()) { + const QString qmakeExecutable = QMakeConfig::qmakeExecutable(project); + if (qmakeExecutable.isEmpty()) { return true; } const QHash vars = queryQMake(project); @@ -78,5 +78,5 @@ if (!project->path().toUrl().isLocalFile()) return QHash(); - return QMakeConfig::queryQMake(QMakeConfig::qmakeBinary(project)); + return QMakeConfig::queryQMake(QMakeConfig::qmakeExecutable(project)); } diff --git a/projectmanagers/qmake/tests/qmaketestconfig.h.in b/projectmanagers/qmake/tests/qmaketestconfig.h.in --- a/projectmanagers/qmake/tests/qmaketestconfig.h.in +++ b/projectmanagers/qmake/tests/qmaketestconfig.h.in @@ -1,3 +1,3 @@ #define QMAKE_TESTS_PROJECTS_DIR "${QMAKE_TESTS_PROJECTS_DIR}" -#define QMAKE_TESTS_QMAKE_BINARY "${QMAKE_EXECUTABLE_LOCATION}" +#define QMAKE_TESTS_QMAKE_EXECUTABLE "${QMAKE_EXECUTABLE_LOCATION}" diff --git a/projectmanagers/qmake/tests/test_qmakefile.cpp b/projectmanagers/qmake/tests/test_qmakefile.cpp --- a/projectmanagers/qmake/tests/test_qmakefile.cpp +++ b/projectmanagers/qmake/tests/test_qmakefile.cpp @@ -80,7 +80,7 @@ QHash setDefaultMKSpec(QMakeProjectFile& file) { - static const QHash qmvars = QMakeConfig::queryQMake(QMakeConfig::qmakeBinary(nullptr)); + static const QHash qmvars = QMakeConfig::queryQMake(QMakeConfig::qmakeExecutable(nullptr)); static const QString specFile = QMakeConfig::findBasicMkSpec(qmvars); Q_ASSERT(QFile::exists(specFile)); QMakeMkSpecs* mkspecs = new QMakeMkSpecs(specFile, qmvars); diff --git a/projectmanagers/qmake/tests/test_qmakeproject.cpp b/projectmanagers/qmake/tests/test_qmakeproject.cpp --- a/projectmanagers/qmake/tests/test_qmakeproject.cpp +++ b/projectmanagers/qmake/tests/test_qmakeproject.cpp @@ -103,12 +103,12 @@ KConfigGroup group(&cfg, QMakeConfig::CONFIG_GROUP); group.writeEntry(QMakeConfig::BUILD_FOLDER, buildDir); - group.writeEntry(QMakeConfig::QMAKE_BINARY, QMAKE_TESTS_QMAKE_BINARY); + group.writeEntry(QMakeConfig::QMAKE_EXECUTABLE, QMAKE_TESTS_QMAKE_EXECUTABLE); group.sync(); /// create subgroup for one build dir KConfigGroup buildDirGroup = KConfigGroup(&cfg, QMakeConfig::CONFIG_GROUP).group(buildDir); - buildDirGroup.writeEntry(QMakeConfig::QMAKE_BINARY, QMAKE_TESTS_QMAKE_BINARY); + buildDirGroup.writeEntry(QMakeConfig::QMAKE_EXECUTABLE, QMAKE_TESTS_QMAKE_EXECUTABLE); buildDirGroup.sync(); QVERIFY(QFileInfo::exists(fileName));