path: root/src/tools
diff options
authorBradley T. Hughes <>2012-02-10 15:50:47 +0100
committerQt by Nokia <>2012-02-17 08:22:43 +0100
commitf0f78eb0a9cc5d5898937201baa0e543ce4cac22 (patch)
treeb9db7b48f92f01935f5c1fb5d0b75037d7537878 /src/tools
parente7b8c9227132a26acd3d975050fd1f6fd4f22944 (diff)
Remove usages of QT_ARCH and QT_ARCH_* from qtbase
The architecture is detected at compile time based on the predefined macros from the compiler. Don't use QT_ARCH in .pro, .pri, or .prf files. The PNG_NO_ASSEMBLER_CODE define from libpng.pri is not present in the current copy of src/3rdparty/libpng, so no change in functionality is expected. The conditional for the SUPPORT_JIT define in pcre.pri is moved to src/3rdparty/pcre/config.h, again so that we can use the compiler's predefined macros to detect the architecture at compile time. Replace QT_ARCH_ARM, QT_ARCH_MIPS, and QT_ARCH_SPARC with their Q_PROCESSOR_* equivalents. Replace QT_ARCH_INTEGRITY, QT_ARCH_VXWORKS, and QT_ARCH_WINDOWSCE with their Q_OS_* equivalents. Note that this commit also effectively disables the SPARC atomic implementation. An inline implementation for SPARC needs to be added, or we remove the current code and instead rely on the GCC intrinsic or C++11 std::atomic support on SPARC. Note also that this commit does not remove QT_ARCH from configure or qconfig.h. This will continue to be set until all Qt 5 projects can be moved away from using QT_ARCH. Change-Id: I5de747cc4436d21941329974cff3016970f497b8 Reviewed-by: Thiago Macieira <> Reviewed-by: Lars Knoll <>
Diffstat (limited to 'src/tools')
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/uic/ b/src/tools/uic/
index 6598180e45..7a95db861f 100644
--- a/src/tools/uic/
+++ b/src/tools/uic/
@@ -14,7 +14,7 @@ HEADERS += uic.h
SOURCES += main.cpp \
-linux-g++-maemo:contains(QT_ARCH, arm) {
+linux-g++-maemo {
# UIC will crash when running inside QEMU if built with -O2