From 858baa7d9019e883fe252bfffac363d24e6d0669 Mon Sep 17 00:00:00 2001 From: Mithra Pattison Date: Wed, 11 Jul 2012 13:37:27 +1000 Subject: [PATCH] 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 --- src/imports/multimedia/multimedia.pro | 4 ++-- src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro index 7c04c7e7..3cb40003 100644 --- a/src/imports/multimedia/multimedia.pro +++ b/src/imports/multimedia/multimedia.pro @@ -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 \ diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index 7807d26b..5730175b 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -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