diff options
| author | Dominik Holland <dominik.holland@pelagicore.com> | 2017-02-01 11:44:38 +0100 |
|---|---|---|
| committer | Robert Griebl <robert.griebl@pelagicore.com> | 2017-02-01 13:18:49 +0000 |
| commit | 9e18b1b2f8b319a41a8fc967e119156be4d8ae7b (patch) | |
| tree | 47d4dd880079399df7c8664492a57e503d3dff2c /src/plugins/ivimedia | |
| parent | 54e452dc1b7f7db8a2c0e1cd5699e3097244e9a9 (diff) | |
| download | qtivi-9e18b1b2f8b319a41a8fc967e119156be4d8ae7b.tar.gz | |
Move qtivi 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.
The geniviextras-only CONFIG option has now been replaced with a
command-line option and can be used by passing it to qmake after '--'.
E.g. 'qmake -- --geniviextras-only'.
Removed adding DLT into the rpath. Similar to all other Qt modules, it
is now expected that packages found using pkg-config can be found by
the dynamic linker.
Change-Id: If46cd1b79413cd7571ee1068898848d9871e61ba
Reviewed-by: Robert Griebl <robert.griebl@pelagicore.com>
Diffstat (limited to 'src/plugins/ivimedia')
| -rw-r--r-- | src/plugins/ivimedia/media_simulator/media_simulator.pro | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/plugins/ivimedia/media_simulator/media_simulator.pro b/src/plugins/ivimedia/media_simulator/media_simulator.pro index 3279207..2a62b5e 100644 --- a/src/plugins/ivimedia/media_simulator/media_simulator.pro +++ b/src/plugins/ivimedia/media_simulator/media_simulator.pro @@ -1,4 +1,5 @@ TARGET = media_simulator +QT_FOR_CONFIG += ivimedia-private PLUGIN_TYPE = qtivi PLUGIN_EXTENDS = qtivi @@ -8,15 +9,7 @@ QT += core ivicore ivimedia sql multimedia load(qt_plugin) -config_taglib { - DEFINES += QT_TAGLIB - !contains(QT_CONFIG, no-pkg-config) { - CONFIG += link_pkgconfig - PKGCONFIG = taglib - } else { - LIBS += -ltag - } -} +qtConfig(taglib): QMAKE_USE += taglib DISTFILES += media_simulator.json |