Fix for broken QML multimedia import on windows
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:
committed by
Qt by Nokia
parent
9a3538fc50
commit
858baa7d90
@@ -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 += \
|
||||
qdeclarativeaudio_p.h \
|
||||
|
||||
@@ -1,10 +1,10 @@
|
||||
load(qt_build_config)
|
||||
|
||||
TEMPLATE = lib
|
||||
|
||||
TARGET = QtMultimediaQuick_p
|
||||
QT = core quick multimedia-private
|
||||
|
||||
load(qt_module_config)
|
||||
|
||||
!static:DEFINES += QT_MAKEDLL
|
||||
|
||||
DEFINES += QT_BUILD_QTMM_QUICK_LIB
|
||||
@@ -22,8 +22,3 @@ SOURCES += \
|
||||
qsgvideonode_p.cpp
|
||||
|
||||
HEADERS += $$PRIVATE_HEADERS
|
||||
|
||||
DESTDIR = $$QT.multimedia.libs
|
||||
target.path = $$[QT_INSTALL_LIBS]
|
||||
|
||||
INSTALLS += target
|
||||
|
||||
Reference in New Issue
Block a user