diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
|---|---|---|
| committer | Kent Hansen <kent.hansen@nokia.com> | 2012-03-16 10:01:29 +0100 |
| commit | 440f452aa3a5609e5f6006a03ac36d41462d5908 (patch) | |
| tree | 598d682291945055e4f6feb08a228212648482c1 /config.tests/arch/arch.pro | |
| parent | cd1e62ffc121cc68c5a133a8095d431f04d966ce (diff) | |
| parent | d4959fa6376255ab4adf8adaeb2ee47ae6b679d2 (diff) | |
Merge master into api_changes
Conflicts:
src/corelib/kernel/qmetatype.cpp
src/gui/kernel/qplatformsurface_qpa.cpp
tests/auto/corelib/tools/qtimeline/qtimeline.pro
Change-Id: Iff3fff34eeeb06f02369767ddfce44cfde505178
Diffstat (limited to 'config.tests/arch/arch.pro')
| -rw-r--r-- | config.tests/arch/arch.pro | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/config.tests/arch/arch.pro b/config.tests/arch/arch.pro new file mode 100644 index 0000000000..108f262a55 --- /dev/null +++ b/config.tests/arch/arch.pro @@ -0,0 +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) +# Message back to configure so that it can set QT_ARCH and QT_HOST_ARCH +message($$COMPILER_ARCH) |