diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2015-10-22 12:54:45 -0700 |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@intel.com> | 2015-10-26 19:57:54 +0000 |
| commit | 00f35b4ae7f94e0fe1c8c77efec401ab5f3c4855 (patch) | |
| tree | 55e38db3a1f83af0dfecab6783ab246a0a83646a /tools | |
| parent | 3b447ae1f3b60794bdceaa4c590751a97b43bd1b (diff) | |
Move pointer size detection entirely to qprocessordetection.h
This commit removes the legacy ptrsize check, which was deficient
because it did not work for multiarch systems (when we supported fat
OS X binaries) and did not work for bootstrap builds because the size
might be different when cross-compiling.
Instead, let's rely on the predefined preprocessor macros to detect
correctly. As a nice side-effect, this fixes 64-bit Android builds
cross-compiled from Windows.
Task-number: QTBUG-48932
Change-Id: I1d0f78915b5942aab07cffff140f9a52b9342f23
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Erik Verbruggen <erik.verbruggen@theqtcompany.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/configure/configureapp.cpp | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/configure/configureapp.cpp b/tools/configure/configureapp.cpp index 886a383122..6c3217baeb 100644 --- a/tools/configure/configureapp.cpp +++ b/tools/configure/configureapp.cpp @@ -2579,11 +2579,6 @@ void Configure::autoDetection() i.value() = defaultTo(i.key()); } - if (tryCompileProject("unix/ptrsize")) - dictionary["QT_POINTER_SIZE"] = "8"; - else - dictionary["QT_POINTER_SIZE"] = "4"; - cout << "Done running configuration tests." << endl; } @@ -3762,8 +3757,6 @@ void Configure::generateConfigfiles() if (dictionary["REDUCE_RELOCATIONS"] == "yes") qconfigList += "QT_REDUCE_RELOCATIONS"; if (dictionary["QT_GETIFADDRS"] == "no") qconfigList += "QT_NO_GETIFADDRS"; - qconfigList += QString("QT_POINTER_SIZE=%1").arg(dictionary["QT_POINTER_SIZE"]); - qconfigList.sort(); for (int i = 0; i < qconfigList.count(); ++i) tmpStream << addDefine(qconfigList.at(i)); |