diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 07:47:06 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-10-22 07:47:06 (GMT) |
| commit | 9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3 (patch) | |
| tree | ec1eb5ec4225b596dca92df654d58b72a229d8a6 /configure | |
| parent | d22741b4bee0e526aefbbd7b851c2aa1b0b1c5b6 (diff) | |
| parent | 4e6790c8dc21c5287bff6799fb0984a72e2f2766 (diff) | |
| download | Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.zip Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.gz Qt-9a216c3f7abeacae8b9e9f78e50ddfcfbb5e2fa3.tar.bz2 | |
Merge remote branch 'lighthouse/4.7' into lighthouse-master
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -6156,6 +6156,12 @@ if [ "$PLATFORM_QPA" = "yes" ]; then fi fi + if "$unixtests/compile.test" "$XQMAKESPEC" "$QMAKE_CONFIG" $OPT_VERBOSE "$relpath" "$outpath" config.tests/mac/coreservices "CoreServices" $L_FLAGS $I_FLAGS $l_FLAGS $MAC_CONFIG_TEST_COMMANDLINE; then + QT_CONFIG="$QT_CONFIG coreservices" + else + QMakeVar add DEFINES QT_NO_CORESERVICES + fi + fi |