diff options
| author | Mithra Pattison <mithra.pattison@nokia.com> | 2012-07-11 13:37:27 +1000 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-07-16 08:40:43 +0200 |
| commit | 858baa7d9019e883fe252bfffac363d24e6d0669 (patch) | |
| tree | e4cd8755e77cfecdf0a2bc9a165a9368050569ae /src/qtmultimediaquicktools | |
| parent | 9a3538fc5081f4d9fe25e52f0b14e0857699cc6b (diff) | |
| download | qtmultimedia-858baa7d9019e883fe252bfffac363d24e6d0669.tar.gz | |
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>
Diffstat (limited to 'src/qtmultimediaquicktools')
| -rw-r--r-- | src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index 7807d26b4..5730175bf 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 |