From c1767ae75e098ae224337cc2b8bd886be54c2e86 Mon Sep 17 00:00:00 2001 From: Jake Petroules Date: Tue, 22 Jul 2014 09:08:36 -0400 Subject: 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 --- share/qbs/modules/qbs/common.qbs | 2 ++ 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 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()); -- cgit v1.2.3