slapin/qtmultimedia
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix for broken QML multimedia import on windows

Browse Source 
Changed qtmultimediaquicktools into a module so that it gets installed
to the bin directory. This allows the declarative_multimedia library
to locate it during the 'import multimedia' process.

Task-number: QTBUG-25984

Change-Id: I559469170bc713fb31633917bcbc210f862660cf
Reviewed-by: Michael Goddard <michael.goddard@nokia.com>
This commit is contained in:
Mithra Pattison
2012-07-11 13:37:27 +10:00
committed by Qt by Nokia
parent 9a3538fc50
commit 858baa7d90
2 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/imports/multimedia/multimedia.pro
View File

@@ -1,6 +1,6 @@
QT += qml quick network multimedia-private QT += qml quick network multimedia-private qtmultimediaquicktools-private
LIBS += -lQtMultimediaQuick_p -L$$QT.multimedia.libs LIBS += -L$$QT.multimedia.libs
HEADERS += \ HEADERS += \
qdeclarativeaudio_p.h \ qdeclarativeaudio_p.h \

9
src/qtmultimediaquicktools/qtmultimediaquicktools.pro
View File

@@ -1,10 +1,10 @@
load(qt_build_config) load(qt_build_config)
TEMPLATE = lib
TARGET = QtMultimediaQuick_p TARGET = QtMultimediaQuick_p
QT = core quick multimedia-private QT = core quick multimedia-private
load(qt_module_config)
!static:DEFINES += QT_MAKEDLL !static:DEFINES += QT_MAKEDLL
DEFINES += QT_BUILD_QTMM_QUICK_LIB DEFINES += QT_BUILD_QTMM_QUICK_LIB
@@ -22,8 +22,3 @@ SOURCES += \
qsgvideonode_p.cpp qsgvideonode_p.cpp
HEADERS += $$PRIVATE_HEADERS HEADERS += $$PRIVATE_HEADERS
DESTDIR = $$QT.multimedia.libs
target.path = $$[QT_INSTALL_LIBS]
INSTALLS += target