diff options
| author | Richard Weickelt <richard@weickelt.de> | 2020-02-05 12:28:43 +0100 |
|---|---|---|
| committer | Richard Weickelt <richard@weickelt.de> | 2020-02-05 12:28:43 +0100 |
| commit | 7e91a76534f5d45ea0901074d4afafacb2fcec9b (patch) | |
| tree | 89d4c08234416fe2f0611131aa9f112492008563 /src | |
| parent | e130e492ebe6ad266a74df7b7d5efdef55dc0ff7 (diff) | |
| parent | bf059105305fd33440940338a7aeb67ec75cb18e (diff) | |
| download | qbs-7e91a76534f5d45ea0901074d4afafacb2fcec9b.tar.gz | |
Merge branch '1.15' into master
Change-Id: I7e348db380b836221db79c73ea3b5f1d891f114b
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 4 | ||||
| -rw-r--r-- | src/lib/corelib/tools/vsenvironmentdetector.cpp | 2 | ||||
| -rw-r--r-- | src/lib/scriptengine/use_scriptengine.pri | 10 |
3 files changed, 14 insertions, 2 deletions
diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index 55b671022..07276bbdc 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -706,6 +706,9 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult, m_qbsVersion.toString())); } + for (Item * const child : projectItem->children()) + child->setScope(projectContext.scope); + resolveProbes(&dummyProductContext, projectItem); projectContext.topLevelProject->probes << dummyProductContext.info.probes; @@ -713,7 +716,6 @@ void ModuleLoader::handleProject(ModuleLoaderResult *loadResult, QList<Item *> multiplexedProducts; for (Item * const child : projectItem->children()) { - child->setScope(projectContext.scope); if (child->type() == ItemType::Product) multiplexedProducts << multiplexProductItem(&dummyProductContext, child); } diff --git a/src/lib/corelib/tools/vsenvironmentdetector.cpp b/src/lib/corelib/tools/vsenvironmentdetector.cpp index b2fd7caf5..95451435a 100644 --- a/src/lib/corelib/tools/vsenvironmentdetector.cpp +++ b/src/lib/corelib/tools/vsenvironmentdetector.cpp @@ -234,6 +234,8 @@ void VsEnvironmentDetector::writeBatchFile(QIODevice *device, const QString &vcv QTextStream s(device); using Qt::endl; s << "@echo off" << endl; + // Avoid execution of powershell (in vsdevcmd.bat), which is not in the cleared PATH + s << "set VSCMD_SKIP_SENDTELEMETRY=1" << endl; for (const MSVC *msvc : msvcs) { s << "echo --" << msvc->architecture << "--" << endl << "setlocal" << endl; diff --git a/src/lib/scriptengine/use_scriptengine.pri b/src/lib/scriptengine/use_scriptengine.pri index 6450e171f..e8f82a949 100644 --- a/src/lib/scriptengine/use_scriptengine.pri +++ b/src/lib/scriptengine/use_scriptengine.pri @@ -3,7 +3,15 @@ isEmpty(QBSLIBDIR) { QBSLIBDIR = $$shadowed($$PWD/../../../$${QBS_LIBRARY_DIRNAME}) } - LIBS += -L$$QBSLIBDIR -lqbsscriptengine$$qtPlatformTargetSuffix() + + LIBS += -L$$QBSLIBDIR + macos { + LIBS += -lqbsscriptengine + } + else { + LIBS += -lqbsscriptengine$$qtPlatformTargetSuffix() + } + } INCLUDEPATH += \ |