Remove qbs.endianness property - it is not used and will not be used.

Change-Id: I21802d17d5aaae8140ad6f666b1571a2f321e18e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

8 files changed, 2 insertions, 58 deletions

diff --git a/doc/reference/modules/qbs-module.qdoc b/doc/reference/modules/qbs-module.qdoc
index 1f60322a3..6881eb9e2 100644
--- a/doc/reference/modules/qbs-module.qdoc
+++ b/doc/reference/modules/qbs-module.qdoc
@@ -218,17 +218,6 @@
     Currently used values are: \c{"x86"}, \c{"x86_64"} and \c{"arm"}.
 
 
-    \section1 endianness
-
-    \table
-    \row    \li \b{Type:}            \li \c{string}
-    \row    \li \b{Allowed Values:}  \li \c{"big"}, \c{"little"}, \c{"mixed"}
-    \row    \li \b{Default:}         \li \c{undefined}
-    \endtable
-
-    Specifies the endianness of the target platform's processor architecture.
-
-
     \section1 toolchain
 
     \table
diff --git a/share/qbs/modules/qbs/common.qbs b/share/qbs/modules/qbs/common.qbs
index 46386b7b7..34818a08d 100644
--- a/share/qbs/modules/qbs/common.qbs
+++ b/share/qbs/modules/qbs/common.qbs
@@ -38,18 +38,6 @@ Module {
     property string profile
     property stringList toolchain
     property string architecture
-
-    property string endianness: {
-        if (["x86", "x86_64"].contains(architecture))
-            return "little";
-    }
-
-    PropertyOptions {
-        name: "endianness"
-        allowedValues: ["big", "little", "mixed"]
-        description: "endianness of the target platform"
-    }
-
     property bool install: false
     property string installSourceBase
     readonly property string installRoot: undefined
@@ -94,12 +82,6 @@ Module {
         }, "'" + architecture + "' is invalid. You must use the canonical name '" +
         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]");
-
         validator.validate();
     }
 
diff --git a/src/app/qbs-setup-toolchains/msvcprobe.cpp b/src/app/qbs-setup-toolchains/msvcprobe.cpp
index 0cfe3d347..053667efe 100644
--- a/src/app/qbs-setup-toolchains/msvcprobe.cpp
+++ b/src/app/qbs-setup-toolchains/msvcprobe.cpp
@@ -72,7 +72,6 @@ static void addMSVCPlatform(const MSVC &msvc, Settings *settings, QList<Profile>
     p.setValue(QLatin1String("cpp.toolchainInstallPath"), installPath);
     p.setValue(QLatin1String("qbs.toolchain"), QStringList(QLatin1String("msvc")));
     p.setValue(QLatin1String("qbs.architecture"), canonicalArchitecture(architecture));
-    p.setValue(QLatin1String("qbs.endianness"), defaultEndianness(architecture));
     if (msvc.version.toInt() >= 2013) {
         const QStringList flags(QLatin1String("/FS"));
         p.setValue(QLatin1String("cpp.platformCFlags"), flags);
diff --git a/src/app/qbs-setup-toolchains/probe.cpp b/src/app/qbs-setup-toolchains/probe.cpp
index 666f9b05b..28e27ac56 100644
--- a/src/app/qbs-setup-toolchains/probe.cpp
+++ b/src/app/qbs-setup-toolchains/probe.cpp
@@ -162,7 +162,6 @@ static void setCommonProperties(Profile &profile, const QString &compilerFilePat
     profile.setValue(QLatin1String("cpp.compilerName"), cfi.fileName());
     profile.setValue(QLatin1String("qbs.toolchain"), toolchainTypes);
     profile.setValue(QLatin1String("qbs.architecture"), canonicalArchitecture(architecture));
-    profile.setValue(QLatin1String("qbs.endianness"), defaultEndianness(architecture));
     setCompilerVersion(compilerFilePath, toolchainTypes, profile);
     setupCompilerPathByLanguage(profile, toolchainTypes, toolchainInstallPath, toolchainPrefix);
 }
diff --git a/src/app/qbs-setup-toolchains/xcodeprobe.cpp b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
index f29450331..5aea6ab4b 100644
--- a/src/app/qbs-setup-toolchains/xcodeprobe.cpp
+++ b/src/app/qbs-setup-toolchains/xcodeprobe.cpp
@@ -139,7 +139,7 @@ void XcodeProbe::setArch(Profile *profile, const QString &pathToGcc, const QStri
         profile->setValue(QLatin1String("cpp.platformCommonCompilerFlags"), extraFlags);
         profile->setValue(QLatin1String("cpp.platformLinkerFlags"), extraFlags);
     }
-    // setting architecture and endianness only here, bercause the same compiler
+    // setting architecture only here, bercause the same compiler
     // can support several ones
     QStringList flags(extraFlags);
     flags << QLatin1String("-dumpmachine");
@@ -160,7 +160,6 @@ void XcodeProbe::setArch(Profile *profile, const QString &pathToGcc, const QStri
                         "        arch: %4").arg(profile->name(), pathToGcc, compilerTriplet,
                                             architecture);
 
-    profile->setValue(QLatin1String("qbs.endianness"), defaultEndianness(architecture));
     profile->setValue(QLatin1String("qbs.architecture"), canonicalArchitecture(architecture));
 }
 
diff --git a/src/lib/corelib/language/testdata/productconditions.qbs b/src/lib/corelib/language/testdata/productconditions.qbs
index 336c41340..f00838e61 100644
--- a/src/lib/corelib/language/testdata/productconditions.qbs
+++ b/src/lib/corelib/language/testdata/productconditions.qbs
@@ -14,6 +14,6 @@ Project {
     }
     Product {
         name: "product_condition_dependent_of_module"
-        condition: qbs.endianness !== (qbs.endianness + "foo")
+        condition: qbs.architecture !== (qbs.architecture + "foo")
     }
 }
diff --git a/src/lib/corelib/tools/architectures.cpp b/src/lib/corelib/tools/architectures.cpp
index eec4a2f8b..751eab1e4 100644
--- a/src/lib/corelib/tools/architectures.cpp
+++ b/src/lib/corelib/tools/architectures.cpp
@@ -88,27 +88,4 @@ QString canonicalArchitecture(const QString &architecture)
 
 }
 
-QString defaultEndianness(const QString &architecture)
-{
-    const QString canonicalArch = canonicalArchitecture(architecture);
-
-    QStringList little = QStringList()
-            << QLatin1String("x86")
-            << QLatin1String("x86_64")
-            << QLatin1String("arm")
-            << QLatin1String("arm64");
-
-    if (little.contains(canonicalArch))
-        return QLatin1String("little");
-
-    QStringList big = QStringList()
-            << QLatin1String("ppc")
-            << QLatin1String("ppc64");
-
-    if (big.contains(canonicalArch))
-        return QLatin1String("big");
-
-    return QString();
-}
-
 } // namespace qbs
diff --git a/src/lib/corelib/tools/architectures.h b/src/lib/corelib/tools/architectures.h
index 3fe7f11a7..6f4a140d3 100644
--- a/src/lib/corelib/tools/architectures.h
+++ b/src/lib/corelib/tools/architectures.h
@@ -35,7 +35,6 @@
 namespace qbs {
 
 QBS_EXPORT QString canonicalArchitecture(const QString &architecture);
-QBS_EXPORT QString defaultEndianness(const QString &architecture);
 
 } // namespace qbs