diff options
| author | Frans Englich <frans.englich@nokia.com> | 2009-08-19 08:15:38 (GMT) |
|---|---|---|
| committer | Frans Englich <frans.englich@nokia.com> | 2009-08-19 08:18:18 (GMT) |
| commit | ca0b5b503e8865c0eedeea86aa132291281fc49f (patch) | |
| tree | 1eca392e65bf5be617a5189d93a8327cc9ec5e34 /src/plugins/phonon | |
| parent | f21096e918a587287d61446e930c40914e2b7ce5 (diff) | |
| parent | 23d2550e6d19c3e84ff2167f5696d4b6dd3f49d4 (diff) | |
| download | Qt-ca0b5b503e8865c0eedeea86aa132291281fc49f.zip Qt-ca0b5b503e8865c0eedeea86aa132291281fc49f.tar.gz Qt-ca0b5b503e8865c0eedeea86aa132291281fc49f.tar.bz2 | |
Merge branch 'master' into mmfphonon
Conflicts:
src/gui/itemviews/qitemselectionmodel.cpp
tests/auto/qitemselectionmodel/tst_qitemselectionmodel.cpp
Diffstat (limited to 'src/plugins/phonon')
| -rw-r--r-- | src/plugins/phonon/qt7/qt7.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/phonon/qt7/qt7.pro b/src/plugins/phonon/qt7/qt7.pro index 665baee..53407db 100644 --- a/src/plugins/phonon/qt7/qt7.pro +++ b/src/plugins/phonon/qt7/qt7.pro @@ -12,7 +12,7 @@ contains(QMAKE_MAC_XARCH, no) { LIBS += -Xarch_i386 -framework QuickTime -Xarch_ppc -framework QuickTime } -LIBS += -framework AudioUnit \ +LIBS += -framework AppKit -framework AudioUnit \ -framework AudioToolbox -framework CoreAudio \ -framework QuartzCore -framework QTKit |