diff options
| author | Girish Ramakrishnan <girish.1.ramakrishnan@nokia.com> | 2012-03-20 21:01:20 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-22 20:59:27 +0100 |
| commit | 4cc9523a3153a0e7b012de3919e0c4f4ccb96265 (patch) | |
| tree | c4d5733084b4c51340c9491f186501035d3ec4ed /config.tests/arch/arch.pro | |
| parent | 31f9df520527be3f7a0f45092dbb5bc9ed1700ff (diff) | |
Make architecture detection more robust.
Any message/error in mkspecs or qmake feature files ends up confusing
the current arch detection logic. Instead, search for
"Project MESSAGE: .* Architecture: <arch>".
Change-Id: I308932a5b75f3a1fcbc4fe30c74faf2e83b2d752
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'config.tests/arch/arch.pro')
| -rw-r--r-- | config.tests/arch/arch.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config.tests/arch/arch.pro b/config.tests/arch/arch.pro index 108f262a55..ea85a52b97 100644 --- a/config.tests/arch/arch.pro +++ b/config.tests/arch/arch.pro @@ -1,7 +1,7 @@ CONFIG -= qt debug_and_release # Detect target by preprocessing a file that uses Q_PROCESSOR_* macros from qprocessordetection.h COMMAND = $$QMAKE_CXX $$QMAKE_CXXFLAGS -E $$PWD/arch.cpp -# 'false' as second argument to system() prevents qmake from stripping newlines -COMPILER_ARCH = $$system($$COMMAND, false) +# system function converts newline in output into spaces +COMPILER_ARCH = $$system($$COMMAND) # Message back to configure so that it can set QT_ARCH and QT_HOST_ARCH message($$COMPILER_ARCH) |