diff options
author | Rohan McGovern <rohan.mcgovern@nokia.com> | 2012-03-05 04:53:58 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-05 05:31:06 +0100 |
commit | 33f82d5b4e24885e4c6cad0a44e058b44d916e14 (patch) | |
tree | 8b4a73bc421defb2ae2aff7f9879736a207b4f16 /mkspecs/common/mac.conf | |
parent | d423fd0975569928faeafad28702750407e889ee (diff) | |
parent | 96232be1466e8c059c270b611ce7c32997ff60a9 (diff) |
Merge "Merge remote-tracking branch 'origin/api_changes'" into refs/staging/master
Diffstat (limited to 'mkspecs/common/mac.conf')
-rw-r--r-- | mkspecs/common/mac.conf | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/mkspecs/common/mac.conf b/mkspecs/common/mac.conf index b22b852013..6ba55325e8 100644 --- a/mkspecs/common/mac.conf +++ b/mkspecs/common/mac.conf @@ -21,9 +21,6 @@ QMAKE_LIBS_OPENGL = -framework OpenGL -framework AGL QMAKE_LIBS_OPENGL_QT = $$QMAKE_LIBS_OPENGL QMAKE_LIBS_THREAD = -QMAKE_MOC = $$[QT_INSTALL_BINS]/moc -QMAKE_UIC = $$[QT_INSTALL_BINS]/uic - QMAKE_AR = ar cq QMAKE_RANLIB = ranlib -s |