diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 03:02:41 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 03:02:41 (GMT) |
| commit | 065f26ef3996368ba67ff5d8e34b20106c359a95 (patch) | |
| tree | 58f9468d97ffa427d58102f452ca7d83344a3556 | |
| parent | a0bcfa560dbc0ad98f8eeb821fe4dd84da207985 (diff) | |
| parent | 2181d48844e923058b136c810a8b9457651e5bbc (diff) | |
| download | Qt-065f26ef3996368ba67ff5d8e34b20106c359a95.zip Qt-065f26ef3996368ba67ff5d8e34b20106c359a95.tar.gz Qt-065f26ef3996368ba67ff5d8e34b20106c359a95.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Install plugins to correct path.
| -rw-r--r-- | src/plugins/mediaservices/directshow/directshow.pro | 2 | ||||
| -rw-r--r-- | src/plugins/mediaservices/gstreamer/gstreamer.pro | 2 | ||||
| -rw-r--r-- | src/plugins/mediaservices/qt7/qt7.pro | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/mediaservices/directshow/directshow.pro b/src/plugins/mediaservices/directshow/directshow.pro index a3080d3..ea133f9 100644 --- a/src/plugins/mediaservices/directshow/directshow.pro +++ b/src/plugins/mediaservices/directshow/directshow.pro @@ -9,6 +9,6 @@ SOURCES += dsserviceplugin.cpp include(mediaplayer/mediaplayer.pri) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mediaservices -target.path = $$[QT_INSTALL_PLUGINS]/plugins/mediaservices +target.path = $$[QT_INSTALL_PLUGINS]/mediaservices INSTALLS += target diff --git a/src/plugins/mediaservices/gstreamer/gstreamer.pro b/src/plugins/mediaservices/gstreamer/gstreamer.pro index 22e3c16..d1bfe44 100644 --- a/src/plugins/mediaservices/gstreamer/gstreamer.pro +++ b/src/plugins/mediaservices/gstreamer/gstreamer.pro @@ -46,5 +46,5 @@ SOURCES += \ include(mediaplayer/mediaplayer.pri) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mediaservices -target.path = $$[QT_INSTALL_PLUGINS]/plugins/mediaservices +target.path = $$[QT_INSTALL_PLUGINS]/mediaservices INSTALLS += target diff --git a/src/plugins/mediaservices/qt7/qt7.pro b/src/plugins/mediaservices/qt7/qt7.pro index 13d14d7..6624d13 100644 --- a/src/plugins/mediaservices/qt7/qt7.pro +++ b/src/plugins/mediaservices/qt7/qt7.pro @@ -40,6 +40,6 @@ OBJECTIVE_SOURCES += \ include(mediaplayer/mediaplayer.pri) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/mediaservices -target.path = $$[QT_INSTALL_PLUGINS]/plugins/mediaservices +target.path = $$[QT_INSTALL_PLUGINS]/mediaservices INSTALLS += target |