summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Rabbe <jonas.rabbe@nokia.com>2012-02-08 14:54:29 +1000
committerQt by Nokia <qt-info@nokia.com>2012-02-08 05:59:34 +0100
commit272be4554fc3a75bf4a243ce851fdc3fe86839c2 (patch)
tree0054ef913677c6809c47284329205bf7e62e54c4
parente241932c974f4b5e36052e4a37e718d9ec3c227b (diff)
Fixed possible dependency problem in the qmake structure
If gstreamer is present, then the gstreamer plugin (and hence the plugins sub directory) should depend on the gst tools library. Change-Id: I6012df02d14731107fc0656089aa27ae61f0ef71 Reviewed-by: Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com>
-rw-r--r--src/src.pro8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/src.pro b/src/src.pro
index 8a553710..4b5b3734 100644
--- a/src/src.pro
+++ b/src/src.pro
@@ -23,7 +23,13 @@ SUBDIRS += \
src_imports
# Optional bits
-contains(config_test_gstreamer, yes):SUBDIRS += src_qgsttools
+contains(config_test_gstreamer, yes) {
+ SUBDIRS += src_qgsttools
+
+ # If gstreamer is present, then plugins should depend on it
+ src_plugins.depends += src_qgsttools
+}
+
!isEmpty(QT.widgets.name) {
SUBDIRS += src_qtmmwidgets