diff options
| author | Jake Petroules <jake.petroules@petroules.com> | 2014-07-22 09:08:36 -0400 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@digia.com> | 2014-07-22 17:03:24 +0200 |
| commit | c1767ae75e098ae224337cc2b8bd886be54c2e86 (patch) | |
| tree | 7aa3d75f6f54452ceca11c8ddda757f0f89ecb2f | |
| parent | 0891934859a1a19abb82e3536ef9f425fe0f5fc8 (diff) | |
Allow qbs.endianness to be undefined.
If the property IS defined, it still must be in [big, little, mixed].
Change-Id: I77d64580d1dcce8ad027500ee8e394bf05d3d961
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
| -rw-r--r-- | share/qbs/modules/qbs/common.qbs | 2 | ||||
| -rw-r--r-- | tests/auto/api/tst_api.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs index 0425d70d5..ca1168409 100644 --- a/share/qbs/modules/qbs/common.qbs +++ b/share/qbs/modules/qbs/common.qbs @@ -93,6 +93,8 @@ Module { canonicalArchitecture(architecture) + "'"); validator.addCustomValidator("endianness", endianness, function (value) { + if (value === undefined) + return true; return ["big", "little", "mixed"].indexOf(value) !== -1; }, "must be in [big, little, mixed]"); diff --git a/tests/auto/api/tst_api.cpp b/tests/auto/api/tst_api.cpp index b981ce6f2..95ec57264 100644 --- a/tests/auto/api/tst_api.cpp +++ b/tests/auto/api/tst_api.cpp @@ -630,7 +630,6 @@ void TestApi::multiArch() QVariantMap overriddenValues; overriddenValues.insert("project.hostProfile", hostProfile.name()); overriddenValues.insert("project.targetProfile", targetProfile.name()); - overriddenValues.insert("qbs.endianness", "little"); // TODO: Why does the qbs module require this? setupParams.setOverriddenValues(overriddenValues); QScopedPointer<qbs::SetupProjectJob> setupJob(qbs::Project().setupProject(setupParams, m_logSink, 0)); @@ -689,7 +688,6 @@ void TestApi::multiArch() // the properties via the product name. overriddenValues.clear(); overriddenValues.insert("p1.profiles", targetProfile.name() + ',' + targetProfile.name()); - overriddenValues.insert("qbs.endianness", "little"); // TODO: Meh. setupParams.setOverriddenValues(overriddenValues); setupJob.reset(project.setupProject(setupParams, m_logSink, 0)); waitForFinished(setupJob.data()); |