diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2016-10-26 16:15:20 +0200 |
|---|---|---|
| committer | Yoann Lopes <yoann.lopes@qt.io> | 2016-11-14 17:03:21 +0000 |
| commit | f0ea26416a73e9ed60e0e0440275e73081f601a2 (patch) | |
| tree | fc757ae3e14e32be4bd4bcd3629d79527308907a /src/plugins/resourcepolicy | |
| parent | d5ab3ab8703ef04cc06d78983bf1a39ecfe99bb4 (diff) | |
Move qtmultimedia over to the new config system
Use the new configuration system to define external
libraries, configure tests and features. Don't use
pkg-config outside of the configuration step. And
move all command line options over from qtbase, so
that we can remove them from there in a second step.
Change-Id: I1aa4b557a6aee17eeceb00602005a2d28b426a26
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: Yoann Lopes <yoann.lopes@qt.io>
Diffstat (limited to 'src/plugins/resourcepolicy')
| -rw-r--r-- | src/plugins/resourcepolicy/resourcepolicy.pro | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/resourcepolicy/resourcepolicy.pro b/src/plugins/resourcepolicy/resourcepolicy.pro index 91a946665..89e75be1b 100644 --- a/src/plugins/resourcepolicy/resourcepolicy.pro +++ b/src/plugins/resourcepolicy/resourcepolicy.pro @@ -1,8 +1,8 @@ TARGET = resourceqt QT += multimedia-private -CONFIG += link_pkgconfig -PKGCONFIG += libresourceqt5 + +QMAKE_USE += libresourceqt5 INCLUDEPATH += $$PWD \ $${SOURCE_DIR}/src/multimedia |