Commit 7cbdff4
committed
Fix mac compilation when Qt Frameworks are in use.
Qt has a special handling for mac frameworks that includes header files. Resetting QMAKE_LIBDIR_QT breaks qmake from generating proper makefile with correct include path.
Fix various other issues such as QMAKE_LFLAGS being never properly set. For the time being limit the change to mac compilation in order to minimise the risk of breaking something else elsewhere.
HD homerun compilation failed due to sig_t being previously defined in sys/signal.h
Conflicts:
mythtv/libs/libmythmetadata/libmythmetadata.pro
[cherry-picked from 5dccbd5]1 parent 4457494 commit 7cbdff4
File tree
4 files changed
+13
-9
lines changed- mythtv
- libs
- libmythhdhomerun
- libmythmetadata
4 files changed
+13
-9
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4754 | 4754 | | |
4755 | 4755 | | |
4756 | 4756 | | |
| 4757 | + | |
| 4758 | + | |
| 4759 | + | |
| 4760 | + | |
| 4761 | + | |
4757 | 4762 | | |
4758 | 4763 | | |
4759 | 4764 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
50 | 50 | | |
51 | 51 | | |
52 | 52 | | |
| 53 | + | |
| 54 | + | |
53 | 55 | | |
| 56 | + | |
54 | 57 | | |
55 | 58 | | |
56 | 59 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | | - | |
58 | | - | |
59 | | - | |
60 | | - | |
61 | 56 | | |
62 | 57 | | |
63 | 58 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
140 | 140 | | |
141 | 141 | | |
142 | 142 | | |
143 | | - | |
144 | | - | |
145 | | - | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
146 | 148 | | |
147 | | - | |
148 | 149 | | |
149 | 150 | | |
150 | 151 | | |
| |||
0 commit comments