diff options
| -rw-r--r-- | doc/qbs.qdoc | 2 | ||||
| -rw-r--r-- | doc/reference/modules/cpp-module.qdoc | 10 | ||||
| -rw-r--r-- | share/qbs/modules/qbs/common.qbs | 2 | ||||
| -rw-r--r-- | src/app/qbs-setup-qt/setupqt.cpp | 4 | ||||
| -rw-r--r-- | tests/auto/blackbox/tst_blackbox.cpp | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/doc/qbs.qdoc b/doc/qbs.qdoc index ca7b02a75..fb5865e59 100644 --- a/doc/qbs.qdoc +++ b/doc/qbs.qdoc @@ -169,7 +169,7 @@ Open a build shell (on Windows open an MSVC command prompt, on other platforms you can usually open the default shell): \code - qbs detect-toolchains + qbs setup-toolchains --detect \endcode The tool chain detector automatically sets up a profile for each detected tool chain. diff --git a/doc/reference/modules/cpp-module.qdoc b/doc/reference/modules/cpp-module.qdoc index c4e7c92f0..dc21eec49 100644 --- a/doc/reference/modules/cpp-module.qdoc +++ b/doc/reference/modules/cpp-module.qdoc @@ -321,7 +321,7 @@ \table \row \li \b{Type:} \li \c{string} - \row \li \b{Default:} \li determined by qbs-detect-toolchains + \row \li \b{Default:} \li determined by qbs-setup-toolchains \endtable Name of the compiler binary. This is set in the build profile. @@ -330,7 +330,7 @@ \table \row \li \b{Type:} \li \c{string} - \row \li \b{Default:} \li determined by qbs-detect-toolchains + \row \li \b{Default:} \li determined by qbs-setup-toolchains \endtable Full path of the compiler binary. This is set in the build profile. @@ -349,7 +349,7 @@ \table \row \li \b{Type:} \li \c{string} - \row \li \b{Default:} \li determined by qbs-detect-toolchains + \row \li \b{Default:} \li determined by qbs-setup-toolchains \endtable Name of the linker binary. This is set in the build profile. @@ -358,7 +358,7 @@ \table \row \li \b{Type:} \li \c{string} - \row \li \b{Default:} \li determined by qbs-detect-toolchains + \row \li \b{Default:} \li determined by qbs-setup-toolchains \endtable Full path of the linker binary. This is set in the build profile. @@ -528,7 +528,7 @@ \table \row \li \b{Type:} \li \c{string} - \row \li \b{Default:} \li determined by qbs-detect-toolchains + \row \li \b{Default:} \li determined by qbs-setup-toolchains \endtable Full path of the archiver binary. This is set in the build profile. diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs index 73f2c5add..2a7dbfad7 100644 --- a/share/qbs/modules/qbs/common.qbs +++ b/share/qbs/modules/qbs/common.qbs @@ -56,7 +56,7 @@ Module { validate: { if (!architecture) { throw new Error("qbs.architecture is not set. " - + "You might want to re-run 'qbs detect-toolchains'."); + + "You might want to re-run 'qbs setup-toolchains'."); } var canonicalArch = canonicalArchitecture(architecture); diff --git a/src/app/qbs-setup-qt/setupqt.cpp b/src/app/qbs-setup-qt/setupqt.cpp index c04011e01..f54dde429 100644 --- a/src/app/qbs-setup-qt/setupqt.cpp +++ b/src/app/qbs-setup-qt/setupqt.cpp @@ -308,7 +308,7 @@ void SetupQt::saveToQbsSettings(const QString &qtVersionName, const QtEnvironmen throw errorInfo; // If this profile does not specify a toolchain and we find exactly one profile that looks - // like it might have been added by qbs-detect-toolchain, let's use that one as our + // like it might have been added by qbs-setup-toolchains, let's use that one as our // base profile. Profile profile(cleanQtVersionName, settings); if (!profile.baseProfile().isEmpty()) @@ -342,7 +342,7 @@ void SetupQt::saveToQbsSettings(const QString &qtVersionName, const QtEnvironmen "use this Qt version for building. "); if (toolchainProfiles.isEmpty()) { message += Tr::tr("However, no toolchain profile was found. Either create one " - "using qbs-detect-toolchains and set it as this profile's " + "using qbs-setup-toolchains and set it as this profile's " "base profile or add the toolchain settings manually " "to this profile."); } else { diff --git a/tests/auto/blackbox/tst_blackbox.cpp b/tests/auto/blackbox/tst_blackbox.cpp index b64dcd829..d92896223 100644 --- a/tests/auto/blackbox/tst_blackbox.cpp +++ b/tests/auto/blackbox/tst_blackbox.cpp @@ -1676,7 +1676,7 @@ void TestBlackbox::installedApp() void TestBlackbox::toolLookup() { - QbsRunParameters params(QLatin1String("detect-toolchains"), QStringList("--help")); + QbsRunParameters params(QLatin1String("setup-toolchains"), QStringList("--help")); params.useProfile = false; QCOMPARE(runQbs(params), 0); } |