ios: fix link and deploy

jeffjuan · Jan 27, 2016 · 5e58cca · 5e58cca
1 parent 45ed316
commit 5e58cca
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/qml/libQmlAV.pro b/qml/libQmlAV.pro
@@ -30,7 +30,9 @@ RESOURCES +=
 QML_FILES = $$PWD/Video.qml
 
 qtav_qml.files = $$PWD/qmldir $$PWD/Video.qml $$PWD/plugins.qmltypes
-!ios: plugin.files = $$DESTDIR/$$qtSharedLib($$NAME)
+!static { #static lib copy error before ranlib. copy only in sdk_install
+  plugin.files = $$DESTDIR/$$qtSharedLib($$NAME)
+}
 plugin.path = $$BUILD_DIR/bin/QtAV/
 mkpath($$plugin.path)
 #plugin.depends = #makefile target

diff --git a/src/libQtAV.pro b/src/libQtAV.pro
@@ -21,6 +21,7 @@ config_gl: QT += opengl
 }
 CONFIG *= qtav-buildlib
 staticlib: DEFINES += BUILD_QTAV_STATIC
+static: CONFIG *= static_ffmpeg
 INCLUDEPATH += $$[QT_INSTALL_HEADERS]
 icon.files = $$PWD/$${TARGET}.svg
 icon.path = /usr/share/icons/hicolor/64x64/apps
@@ -344,7 +345,7 @@ winrt {
 glibc_compat: *linux*: LIBS += -lrt  # do not use clock_gettime in libc, GLIBC_2.17 is not available on old system
 static_ffmpeg {
 # libs needed by mac static ffmpeg. corefoundation: vda, avdevice
-  mac: LIBS += -liconv -lbz2 -lz -framework CoreFoundation  -Wl,-framework,Security
+  mac|ios: LIBS += -liconv -lbz2 -lz -framework CoreFoundation  -Wl,-framework,Security
   win32: LIBS *= -lws2_32 -lstrmiids -lvfw32 -luuid
   !mac:*g++* {
     LIBS *= -lz

diff --git a/tools/install_sdk/install_sdk.pro b/tools/install_sdk/install_sdk.pro
@@ -361,6 +361,8 @@ greaterThan(QT_MAJOR_VERSION, 4) {
     } else {
       sdk_qml_install.commands = $$quote($$COPY_DIR $$system_path($$BUILD_DIR/bin/QtAV) $$system_path($$[QT_INSTALL_QML]))
     }
+    static: sdk_qml_install.commands += $$quote($$COPY $$system_path($$PROJECT_LIBDIR/$$ORIG_LIB/libQmlAV*) $$system_path($$[QT_INSTALL_QML]/QtAV/))
+#static qml plugin is not copied to bin/QtAV. copy it and prl
     sdk_qml_install.commands += $$quote($$COPY $$system_path($$PROJECTROOT/qml/plugins.qmltypes) $$system_path($$[QT_INSTALL_QML]/QtAV/))
     sdk_qml_uninstall.commands = $$quote($$RM_DIR $$system_path($$[QT_INSTALL_QML]/QtAV))
     write_file($$BUILD_DIR/sdk_install.$$SCRIPT_SUFFIX, sdk_qml_install.commands, append)