Permalink
Browse files

Partially revert 5dccbd5

While this worked when using Qt frameworks on a mac, when using Qt libs I was seeing the same issue as in edae94e.
Basically, it would like with old mythtv libs.

Rework the changes so we do reset QMAKE_LIBDIR_QT when not using Qt frameworks on a mac
  • Loading branch information...
1 parent cc2ad7f commit f6a865068a29f438af46767b78c4e3bbdacf5704 @jyavenard jyavenard committed Mar 15, 2012
Showing with 6 additions and 2 deletions.
  1. +6 −2 mythtv/settings.pro
View
@@ -138,8 +138,12 @@ LOCAL_LIBDIR_OGL =
}
QMAKE_LIBDIR_OPENGL =
-!macx {
- !isEmpty( QMAKE_LIBDIR_QT ) {
+!isEmpty( QMAKE_LIBDIR_QT ) {
+ !macx {
+ LATE_LIBS += "-L$$QMAKE_LIBDIR_QT"
+ QMAKE_LIBDIR_QT = ""
+ }
+ macx:!qt_framework {
LATE_LIBS += "-L$$QMAKE_LIBDIR_QT"
QMAKE_LIBDIR_QT = ""
}

0 comments on commit f6a8650

Please sign in to comment.