9ce5a0671a
When set in configure it would be written to .qmake.cache and would only apply when building Qt. We then had an override (that was also out of sync, version-wise) in the g++ mkspec, which would also apply to apps building agains Qt. This override did howerver not apply when using the Clang mkspec. We now move setting macosx-version-min to the common macx mkspec, shared by both g++ and Clang, which will apply both when building Qt and when building something against Qt. The latter since an application built against Qt will not deploy on versions of Mac OS earlier than 10.6 anyways, so we might as well always set the minimum-version. The modifications to the mkspecs will result in macosx-version-min being passed twice when compiling qmake, as configure writes its own makefiles and the mkspec parsing in configure has a bug where it will lazily evaluate qmake-variables instead of evaluating them inline. This is not a problem, and can be fixed in a later patch if seen fit. Change-Id: Ib29503ad00a9dc00e0a50b0dbd9459e89a20dfbd Reviewed-by: Zeno Albisser <zeno.albisser@nokia.com> Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
30 lines
1.2 KiB
Plaintext
30 lines
1.2 KiB
Plaintext
#
|
|
# Qmake configuration for the GNU C++ compiler on Mac OS X
|
|
#
|
|
# Before making changes to this file, please read the comment in
|
|
# gcc-base.conf, to make sure the change goes in the right place.
|
|
#
|
|
# To verify that your change has the desired effect on the final configuration
|
|
# you can use the manual test in tests/manual/mkspecs.
|
|
#
|
|
|
|
include(g++-base.conf)
|
|
|
|
QMAKE_CFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_DWARF2
|
|
QMAKE_CXXFLAGS_RELEASE_WITH_DEBUGINFO += $$QMAKE_CFLAGS_DWARF2
|
|
QMAKE_LFLAGS_RELEASE_WITH_DEBUGINFO += -g $$QMAKE_CFLAGS_DWARF2
|
|
|
|
QMAKE_LFLAGS_STATIC_LIB += -all_load
|
|
|
|
QMAKE_CXXFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
|
|
QMAKE_CXXFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64
|
|
QMAKE_OBJECTIVE_CFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
|
|
QMAKE_OBJECTIVE_CFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64
|
|
QMAKE_LFLAGS_X86_64 = $$QMAKE_CFLAGS_X86_64
|
|
QMAKE_LFLAGS_PPC_64 = $$QMAKE_CFLAGS_PPC_64
|
|
|
|
QMAKE_OBJCFLAGS_PRECOMPILE = -x objective-c-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
|
|
QMAKE_OBJCFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
|
|
QMAKE_OBJCXXFLAGS_PRECOMPILE = -x objective-c++-header -c ${QMAKE_PCH_INPUT} -o ${QMAKE_PCH_OUTPUT}
|
|
QMAKE_OBJCXXFLAGS_USE_PRECOMPILE = $$QMAKE_CFLAGS_USE_PRECOMPILE
|