Browse Source

Merge pull request #2464 from Noctem/stdlib-flags

Fix OS X compilation and packaging
adaptive-webui-19844
sledgehammer999 10 years ago
parent
commit
d0b476a4be
  1. 3
      macxconf.pri
  2. 1
      src/mac/qt.conf

3
macxconf.pri

@ -10,6 +10,7 @@ exists($$OUT_PWD/../conf.pri) {
} }
LIBS += -framework Carbon -framework IOKit LIBS += -framework Carbon -framework IOKit
CONFIG += c++11
document_icon.path = Contents/Resources document_icon.path = Contents/Resources
document_icon.files = mac/qBitTorrentDocument.icns document_icon.files = mac/qBitTorrentDocument.icns
@ -19,7 +20,7 @@ qt_conf.path = Contents/Resources
qt_conf.files = mac/qt.conf qt_conf.files = mac/qt.conf
QMAKE_BUNDLE_DATA += qt_conf QMAKE_BUNDLE_DATA += qt_conf
qt_translations.path = Contents/MacOS/translations qt_translations.path = Contents/translations
qt_translations.files = qt-translations/qt_ar.qm \ qt_translations.files = qt-translations/qt_ar.qm \
qt-translations/qt_bg.qm \ qt-translations/qt_bg.qm \
qt-translations/qt_ca.qm \ qt-translations/qt_ca.qm \

1
src/mac/qt.conf

@ -1,4 +1,3 @@
[Paths] [Paths]
Prefix = MacOS
Translations = translations Translations = translations
Plugins = PlugIns Plugins = PlugIns

Loading…
Cancel
Save