diff options
| author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-05-10 13:12:30 (GMT) |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-05-10 13:12:30 (GMT) |
| commit | 395508f4700bb72c120e0f9e8a19ffa69a7c5d88 (patch) | |
| tree | 92efbecc98b018cfc617aab2c4811f921becd79c /mkspecs/common/mac.conf | |
| parent | 6f39ecdabdae9b2132729a2a9940e5febaa420d2 (diff) | |
| parent | 03f8f1df0d88f5ffe0b3120cffce614cbeefdb70 (diff) | |
| download | Qt-395508f4700bb72c120e0f9e8a19ffa69a7c5d88.zip Qt-395508f4700bb72c120e0f9e8a19ffa69a7c5d88.tar.gz Qt-395508f4700bb72c120e0f9e8a19ffa69a7c5d88.tar.bz2 | |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
src/gui/egl/egl.pri
src/gui/painting/qwindowsurface_p.h
Diffstat (limited to 'mkspecs/common/mac.conf')
| -rw-r--r-- | mkspecs/common/mac.conf | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index 5d88ac4..96cd239 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -14,7 +14,7 @@ QMAKE_INCDIR_OPENGL = /System/Library/Frameworks/OpenGL.framework/Headers \ QMAKE_FIX_RPATH = install_name_tool -id -QMAKE_RPATH = +QMAKE_LFLAGS_RPATH = QMAKE_LIBS_DYNLOAD = QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL |