Skip to content

Commit

Permalink
examples/QMLPlayer: remove empty font file in qrc
Browse files Browse the repository at this point in the history
compiling fonts into qrc is too slow.   deploying fonts in package is
better.
deploy: android: assets, ios: QMAKE_BUNDLE_DATA, winrt: DEPLOYMENT
  • Loading branch information
wang-bin committed Feb 9, 2016
1 parent e7da6d1 commit 6f1db0f
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
9 changes: 8 additions & 1 deletion examples/QMLPlayer/QMLPlayer_sdk.pro
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,14 @@ COMMON = $$PWD/../common
INCLUDEPATH *= $$COMMON $$COMMON/..
RESOURCES += $$COMMON/theme/theme.qrc
isEmpty(PROJECTROOT): PROJECTROOT = $$PWD/../..

fonts.files = fonts
fonts.path = fonts
QMAKE_BUNDLE_DATA += fonts
mac: RC_FILE = $$PROJECTROOT/src/QtAV.icns
QMAKE_INFO_PLIST = $$COMMON/Info.plist
#ios: QMAKE_INFO_PLIST = ios/Info.plist

defineTest(genRC) {
RC_ICONS = $$PROJECTROOT/src/QtAV.ico
QMAKE_TARGET_COMPANY = "Shanghai University->S3 Graphics->Deepin | [email protected]"
Expand Down Expand Up @@ -92,6 +98,7 @@ android {
android/gradlew.bat

ANDROID_PACKAGE_SOURCE_DIR = $$PWD/android
#user can put fonts in android/assets/fonts
}
winrt|wince {
winrt:isEqual(QT_MAJOR_VERSION, 5):lessThan(QT_MINOR_VERSION, 7) {
Expand All @@ -118,7 +125,7 @@ winrt|wince {
$$[QT_INSTALL_BINS]/swscale-*.dll
exists($$[QT_INSTALL_BINS]/ass.dll): depend_dll.files += $$[QT_INSTALL_BINS]/ass.dll
#depend_dll.path = $$OUT_PWD
DEPLOYMENT = depend_dll #vs2015update1 error about multiple qt5core.dll(in both build dir and qtbin dir), we can remove them in `Deployment Files`
DEPLOYMENT = depend_dll fonts #vs2015update1 error about multiple qt5core.dll(in both build dir and qtbin dir), we can remove them in `Deployment Files`
# WINRT_MANIFEST file: "=>\"
winphone {
WINRT_MANIFEST = winrt/WinPhone8.Package.appxmanifest
Expand Down
Empty file.
1 change: 0 additions & 1 deletion examples/QMLPlayer/qmlplayer.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
<file>qml/QMLPlayer/MediaInfoPage.qml</file>
<file>qml/QMLPlayer/About.qml</file>
<file>i18n/QMLPlayer_zh_CN.qm</file>
<file>fonts/default.ttf</file>
<file>qml/QMLPlayer/MiscPage.qml</file>
</qresource>
</RCC>

0 comments on commit 6f1db0f

Please sign in to comment.