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 /src/gui/kernel/mac.pri | |
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 'src/gui/kernel/mac.pri')
-rw-r--r-- | src/gui/kernel/mac.pri | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/mac.pri b/src/gui/kernel/mac.pri index eb47ce9..21acd06 100644 --- a/src/gui/kernel/mac.pri +++ b/src/gui/kernel/mac.pri @@ -1,4 +1,4 @@ -!x11:!embedded:!nacl:mac { +!x11:!embedded:!qpa:mac { LIBS_PRIVATE += -framework Carbon -lz *-mwerks:INCLUDEPATH += compat } |