summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJochen Seemann <seemann.jochen@gmail.com>2017-06-12 22:19:25 +0200
committerVaL Doroshchuk <valentyn.doroshchuk@qt.io>2019-01-31 09:07:44 +0000
commitb0c7dffcdb1150dd9d8cbf92b93ce0cae4fa10ad (patch)
treee8e14742f690ed5be9149f931be9dd462b72012b
parent3c82c2e45c8395b78b3a98db2d9a5364b191edb9 (diff)
GstTools: move headers to correct folder
We don't need to have the headers of QtMMGstTools in a separate directory of the QtMultimedia module. Change-Id: If304ab5ee5741aec7cf7785352f5a571bc4ec240 Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
-rw-r--r--src/gsttools/gsttools.pro6
-rw-r--r--src/gsttools/gstvideoconnector_p.h (renamed from src/multimedia/gsttools_headers/gstvideoconnector_p.h)0
-rw-r--r--src/gsttools/qgstappsrc_p.h (renamed from src/multimedia/gsttools_headers/qgstappsrc_p.h)0
-rw-r--r--src/gsttools/qgstbufferpoolinterface_p.h (renamed from src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h)0
-rw-r--r--src/gsttools/qgstcodecsinfo_p.h (renamed from src/multimedia/gsttools_headers/qgstcodecsinfo_p.h)0
-rw-r--r--src/gsttools/qgstreameraudioinputselector_p.h (renamed from src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h)0
-rw-r--r--src/gsttools/qgstreameraudioprobecontrol_p.h (renamed from src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h)0
-rw-r--r--src/gsttools/qgstreamerbufferprobe_p.h (renamed from src/multimedia/gsttools_headers/qgstreamerbufferprobe_p.h)0
-rw-r--r--src/gsttools/qgstreamerbushelper_p.h (renamed from src/multimedia/gsttools_headers/qgstreamerbushelper_p.h)0
-rw-r--r--src/gsttools/qgstreamermessage_p.h (renamed from src/multimedia/gsttools_headers/qgstreamermessage_p.h)0
-rw-r--r--src/gsttools/qgstreamermirtexturerenderer_p.h (renamed from src/multimedia/gsttools_headers/qgstreamermirtexturerenderer_p.h)0
-rw-r--r--src/gsttools/qgstreamerplayercontrol_p.h (renamed from src/multimedia/gsttools_headers/qgstreamerplayercontrol_p.h)0
-rw-r--r--src/gsttools/qgstreamerplayersession_p.h (renamed from src/multimedia/gsttools_headers/qgstreamerplayersession_p.h)0
-rw-r--r--src/gsttools/qgstreamervideoinputdevicecontrol_p.h (renamed from src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h)0
-rw-r--r--src/gsttools/qgstreamervideooverlay_p.h (renamed from src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h)0
-rw-r--r--src/gsttools/qgstreamervideoprobecontrol_p.h (renamed from src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h)0
-rw-r--r--src/gsttools/qgstreamervideorenderer_p.h (renamed from src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h)0
-rw-r--r--src/gsttools/qgstreamervideorendererinterface_p.h (renamed from src/multimedia/gsttools_headers/qgstreamervideorendererinterface_p.h)0
-rw-r--r--src/gsttools/qgstreamervideowidget_p.h (renamed from src/multimedia/gsttools_headers/qgstreamervideowidget_p.h)0
-rw-r--r--src/gsttools/qgstreamervideowindow_p.h (renamed from src/multimedia/gsttools_headers/qgstreamervideowindow_p.h)0
-rw-r--r--src/gsttools/qgsttools_global_p.h (renamed from src/multimedia/gsttools_headers/qgsttools_global_p.h)0
-rw-r--r--src/gsttools/qgstutils_p.h (renamed from src/multimedia/gsttools_headers/qgstutils_p.h)0
-rw-r--r--src/gsttools/qgstvideobuffer_p.h (renamed from src/multimedia/gsttools_headers/qgstvideobuffer_p.h)0
-rw-r--r--src/gsttools/qgstvideorendererplugin_p.h (renamed from src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h)0
-rw-r--r--src/gsttools/qgstvideorenderersink_p.h (renamed from src/multimedia/gsttools_headers/qgstvideorenderersink_p.h)0
-rw-r--r--src/gsttools/qvideosurfacegstsink_p.h (renamed from src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h)0
26 files changed, 0 insertions, 6 deletions
diff --git a/src/gsttools/gsttools.pro b/src/gsttools/gsttools.pro
index ca111b3f2..b13479ce7 100644
--- a/src/gsttools/gsttools.pro
+++ b/src/gsttools/gsttools.pro
@@ -15,12 +15,6 @@ QMAKE_USE += gstreamer
qtConfig(resourcepolicy): \
QMAKE_USE += libresourceqt5
-# Header files must go inside source directory of a module
-# to be installed by syncqt.
-INCLUDEPATH += ../multimedia/gsttools_headers/
-INCLUDEPATH += ../plugins/gstreamer/mediaplayer/
-VPATH += ../multimedia/gsttools_headers/
-
PRIVATE_HEADERS += \
qgstreamerbushelper_p.h \
qgstreamermessage_p.h \
diff --git a/src/multimedia/gsttools_headers/gstvideoconnector_p.h b/src/gsttools/gstvideoconnector_p.h
index a38ca2e65..a38ca2e65 100644
--- a/src/multimedia/gsttools_headers/gstvideoconnector_p.h
+++ b/src/gsttools/gstvideoconnector_p.h
diff --git a/src/multimedia/gsttools_headers/qgstappsrc_p.h b/src/gsttools/qgstappsrc_p.h
index c7e87037d..c7e87037d 100644
--- a/src/multimedia/gsttools_headers/qgstappsrc_p.h
+++ b/src/gsttools/qgstappsrc_p.h
diff --git a/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h b/src/gsttools/qgstbufferpoolinterface_p.h
index 45e573262..45e573262 100644
--- a/src/multimedia/gsttools_headers/qgstbufferpoolinterface_p.h
+++ b/src/gsttools/qgstbufferpoolinterface_p.h
diff --git a/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h b/src/gsttools/qgstcodecsinfo_p.h
index 33ab3de4b..33ab3de4b 100644
--- a/src/multimedia/gsttools_headers/qgstcodecsinfo_p.h
+++ b/src/gsttools/qgstcodecsinfo_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h b/src/gsttools/qgstreameraudioinputselector_p.h
index 0c193fda9..0c193fda9 100644
--- a/src/multimedia/gsttools_headers/qgstreameraudioinputselector_p.h
+++ b/src/gsttools/qgstreameraudioinputselector_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h b/src/gsttools/qgstreameraudioprobecontrol_p.h
index 4fc5c7704..4fc5c7704 100644
--- a/src/multimedia/gsttools_headers/qgstreameraudioprobecontrol_p.h
+++ b/src/gsttools/qgstreameraudioprobecontrol_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamerbufferprobe_p.h b/src/gsttools/qgstreamerbufferprobe_p.h
index 35644f934..35644f934 100644
--- a/src/multimedia/gsttools_headers/qgstreamerbufferprobe_p.h
+++ b/src/gsttools/qgstreamerbufferprobe_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h b/src/gsttools/qgstreamerbushelper_p.h
index c7d06faf8..c7d06faf8 100644
--- a/src/multimedia/gsttools_headers/qgstreamerbushelper_p.h
+++ b/src/gsttools/qgstreamerbushelper_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamermessage_p.h b/src/gsttools/qgstreamermessage_p.h
index 2f9d1745c..2f9d1745c 100644
--- a/src/multimedia/gsttools_headers/qgstreamermessage_p.h
+++ b/src/gsttools/qgstreamermessage_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamermirtexturerenderer_p.h b/src/gsttools/qgstreamermirtexturerenderer_p.h
index 62150f7e1..62150f7e1 100644
--- a/src/multimedia/gsttools_headers/qgstreamermirtexturerenderer_p.h
+++ b/src/gsttools/qgstreamermirtexturerenderer_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamerplayercontrol_p.h b/src/gsttools/qgstreamerplayercontrol_p.h
index e2252ea52..e2252ea52 100644
--- a/src/multimedia/gsttools_headers/qgstreamerplayercontrol_p.h
+++ b/src/gsttools/qgstreamerplayercontrol_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamerplayersession_p.h b/src/gsttools/qgstreamerplayersession_p.h
index 447b9816a..447b9816a 100644
--- a/src/multimedia/gsttools_headers/qgstreamerplayersession_p.h
+++ b/src/gsttools/qgstreamerplayersession_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h b/src/gsttools/qgstreamervideoinputdevicecontrol_p.h
index b660cc7b3..b660cc7b3 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideoinputdevicecontrol_p.h
+++ b/src/gsttools/qgstreamervideoinputdevicecontrol_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h b/src/gsttools/qgstreamervideooverlay_p.h
index f2ca8a23b..f2ca8a23b 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideooverlay_p.h
+++ b/src/gsttools/qgstreamervideooverlay_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h b/src/gsttools/qgstreamervideoprobecontrol_p.h
index b15b6099c..b15b6099c 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideoprobecontrol_p.h
+++ b/src/gsttools/qgstreamervideoprobecontrol_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h b/src/gsttools/qgstreamervideorenderer_p.h
index d87bfcb8f..d87bfcb8f 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideorenderer_p.h
+++ b/src/gsttools/qgstreamervideorenderer_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamervideorendererinterface_p.h b/src/gsttools/qgstreamervideorendererinterface_p.h
index 231c843db..231c843db 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideorendererinterface_p.h
+++ b/src/gsttools/qgstreamervideorendererinterface_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamervideowidget_p.h b/src/gsttools/qgstreamervideowidget_p.h
index 1ddb738df..1ddb738df 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideowidget_p.h
+++ b/src/gsttools/qgstreamervideowidget_p.h
diff --git a/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h b/src/gsttools/qgstreamervideowindow_p.h
index 5f893f10e..5f893f10e 100644
--- a/src/multimedia/gsttools_headers/qgstreamervideowindow_p.h
+++ b/src/gsttools/qgstreamervideowindow_p.h
diff --git a/src/multimedia/gsttools_headers/qgsttools_global_p.h b/src/gsttools/qgsttools_global_p.h
index babcd3aaf..babcd3aaf 100644
--- a/src/multimedia/gsttools_headers/qgsttools_global_p.h
+++ b/src/gsttools/qgsttools_global_p.h
diff --git a/src/multimedia/gsttools_headers/qgstutils_p.h b/src/gsttools/qgstutils_p.h
index 24d3e889d..24d3e889d 100644
--- a/src/multimedia/gsttools_headers/qgstutils_p.h
+++ b/src/gsttools/qgstutils_p.h
diff --git a/src/multimedia/gsttools_headers/qgstvideobuffer_p.h b/src/gsttools/qgstvideobuffer_p.h
index c67c57021..c67c57021 100644
--- a/src/multimedia/gsttools_headers/qgstvideobuffer_p.h
+++ b/src/gsttools/qgstvideobuffer_p.h
diff --git a/src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h b/src/gsttools/qgstvideorendererplugin_p.h
index df36dbe09..df36dbe09 100644
--- a/src/multimedia/gsttools_headers/qgstvideorendererplugin_p.h
+++ b/src/gsttools/qgstvideorendererplugin_p.h
diff --git a/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h b/src/gsttools/qgstvideorenderersink_p.h
index d2417a7c9..d2417a7c9 100644
--- a/src/multimedia/gsttools_headers/qgstvideorenderersink_p.h
+++ b/src/gsttools/qgstvideorenderersink_p.h
diff --git a/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h b/src/gsttools/qvideosurfacegstsink_p.h
index 961cf91d2..961cf91d2 100644
--- a/src/multimedia/gsttools_headers/qvideosurfacegstsink_p.h
+++ b/src/gsttools/qvideosurfacegstsink_p.h