diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2019-01-11 15:13:53 +0100 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2019-01-11 15:13:53 +0100 |
| commit | 34ef874fee31f05e2bd3d789f94b29771907322c (patch) | |
| tree | cbbca795b10ccabce02a05e9525905c57b7ed41d /src | |
| parent | 18e7c621c3ffeebbba8f2ec0c7dcc8db0499678c (diff) | |
| parent | 7a047f825ba82e3f05b87c68ac421f8e95815920 (diff) | |
Merge 1.12 into master
Change-Id: Id535625f198f10a920f32e198d39b38d46b35668
Diffstat (limited to 'src')
| -rw-r--r-- | src/app/qbs-setup-android/commandlineparser.cpp | 1 | ||||
| -rw-r--r-- | src/app/qbs-setup-toolchains/commandlineparser.cpp | 1 | ||||
| -rw-r--r-- | src/lib/corelib/language/moduleloader.cpp | 6 |
3 files changed, 6 insertions, 2 deletions
diff --git a/src/app/qbs-setup-android/commandlineparser.cpp b/src/app/qbs-setup-android/commandlineparser.cpp index 616c829de..df84f5332 100644 --- a/src/app/qbs-setup-android/commandlineparser.cpp +++ b/src/app/qbs-setup-android/commandlineparser.cpp @@ -101,6 +101,7 @@ void CommandLineParser::parse(const QStringList &commandLine) throwError(Tr::tr("No profile name supplied.")); case 1: m_profileName = m_commandLine.takeFirst(); + m_profileName.replace(QLatin1Char('.'), QLatin1Char('-')); break; default: complainAboutExtraArguments(); diff --git a/src/app/qbs-setup-toolchains/commandlineparser.cpp b/src/app/qbs-setup-toolchains/commandlineparser.cpp index fd2e0214f..d96e18b7d 100644 --- a/src/app/qbs-setup-toolchains/commandlineparser.cpp +++ b/src/app/qbs-setup-toolchains/commandlineparser.cpp @@ -97,6 +97,7 @@ void CommandLineParser::parse(const QStringList &commandLine) case 2: m_compilerPath = m_commandLine.at(0); m_profileName = m_commandLine.at(1); + m_profileName.replace(QLatin1Char('.'), QLatin1Char('-')); break; default: complainAboutExtraArguments(); diff --git a/src/lib/corelib/language/moduleloader.cpp b/src/lib/corelib/language/moduleloader.cpp index d0d004cff..b34cfd6a9 100644 --- a/src/lib/corelib/language/moduleloader.cpp +++ b/src/lib/corelib/language/moduleloader.cpp @@ -2341,9 +2341,11 @@ void ModuleLoader::adjustDefiningItemsInGroupModuleInstances(const Item::Module << ", old defining item was " << v->definingItem() << " with scope" << v->definingItem()->scope() << ", new defining item is" << replacement - << " with scope" << replacement->scope() - << ", value source code is " + << " with scope" << replacement->scope(); + if (v->type() == Value::JSSourceValueType) { + qCDebug(lcModuleLoader) << "value source code is" << std::static_pointer_cast<JSSourceValue>(v)->sourceCode().toString(); + } replacement->setPropertyDeclaration(propName, decl); replacement->setProperty(propName, v); } else { |