diff options
| -rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput_backend_p.h (renamed from src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_backend_p.h) | 0 | ||||
| -rw-r--r-- | src/qtmultimediaquicktools/qdeclarativevideooutput_p.h (renamed from src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h) | 0 | ||||
| -rw-r--r-- | src/qtmultimediaquicktools/qsgvideonode_p.h (renamed from src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h) | 0 | ||||
| -rw-r--r-- | src/qtmultimediaquicktools/qtmultimediaquickdefs_p.h (renamed from src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h) | 0 | ||||
| -rw-r--r-- | src/qtmultimediaquicktools/qtmultimediaquicktools.pro | 5 | ||||
| -rw-r--r-- | tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro | 2 | ||||
| -rw-r--r-- | tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro | 2 |
7 files changed, 2 insertions, 7 deletions
diff --git a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_backend_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_backend_p.h index da99b387a..da99b387a 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_backend_p.h +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_backend_p.h diff --git a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h b/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h index 8ea0dc338..8ea0dc338 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qdeclarativevideooutput_p.h +++ b/src/qtmultimediaquicktools/qdeclarativevideooutput_p.h diff --git a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h b/src/qtmultimediaquicktools/qsgvideonode_p.h index c094bed1f..c094bed1f 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qsgvideonode_p.h +++ b/src/qtmultimediaquicktools/qsgvideonode_p.h diff --git a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h b/src/qtmultimediaquicktools/qtmultimediaquickdefs_p.h index 20188739c..20188739c 100644 --- a/src/multimedia/qtmultimediaquicktools_headers/qtmultimediaquickdefs_p.h +++ b/src/qtmultimediaquicktools/qtmultimediaquickdefs_p.h diff --git a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro index bffdc6ec2..7c8d07647 100644 --- a/src/qtmultimediaquicktools/qtmultimediaquicktools.pro +++ b/src/qtmultimediaquicktools/qtmultimediaquicktools.pro @@ -3,11 +3,6 @@ TARGET = QtMultimediaQuick QT = core quick multimedia-private CONFIG += internal_module -# Header files must go inside source directory of a module -# to be installed by syncqt. -INCLUDEPATH += ../multimedia/qtmultimediaquicktools_headers/ -VPATH += ../multimedia/qtmultimediaquicktools_headers/ - PRIVATE_HEADERS += \ qdeclarativevideooutput_p.h \ qdeclarativevideooutput_backend_p.h \ diff --git a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro index 1f3a00b42..c4221232a 100644 --- a/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro +++ b/tests/auto/integration/qdeclarativevideooutput/qdeclarativevideooutput.pro @@ -1,6 +1,6 @@ TARGET = tst_qdeclarativevideooutput -QT += multimedia-private qml testlib quick +QT += multimedia-private qml testlib quick qtmultimediaquicktools-private CONFIG += testcase RESOURCES += qml.qrc diff --git a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro index 82108d220..eeb1c0135 100644 --- a/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro +++ b/tests/auto/integration/qdeclarativevideooutput_window/qdeclarativevideooutput_window.pro @@ -1,6 +1,6 @@ TARGET = tst_qdeclarativevideooutput_window -QT += multimedia-private qml testlib quick +QT += multimedia-private qml testlib quick qtmultimediaquicktools-private CONFIG += testcase RESOURCES += qml.qrc |