summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/imports/multimedia/multimedia.pro4
-rw-r--r--src/qtmultimediaquicktools/qtmultimediaquicktools.pro9
2 files changed, 4 insertions, 9 deletions
diff --git a/src/imports/multimedia/multimedia.pro b/src/imports/multimedia/multimedia.pro
index 7c04c7e77..3cb400036 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 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