diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-07 06:44:27 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-06-07 06:44:27 (GMT) |
| commit | d3527d779b784ad89285bcb8790504354d9dd3ae (patch) | |
| tree | dd369b0b829e7f49c86f9d8065ec468262cf1b76 | |
| parent | f68bab66aacded35be3d222e703e74e9db0bada3 (diff) | |
| parent | 1b9b0b0e0e9f10420abc68825916195e54ba8a72 (diff) | |
| download | Qt-d3527d779b784ad89285bcb8790504354d9dd3ae.zip Qt-d3527d779b784ad89285bcb8790504354d9dd3ae.tar.gz Qt-d3527d779b784ad89285bcb8790504354d9dd3ae.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:
Fixed `make install' for qmediaplayer demo.
| -rw-r--r-- | demos/qmediaplayer/qmediaplayer.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demos/qmediaplayer/qmediaplayer.pro b/demos/qmediaplayer/qmediaplayer.pro index cfe3905..9407a81 100644 --- a/demos/qmediaplayer/qmediaplayer.pro +++ b/demos/qmediaplayer/qmediaplayer.pro @@ -17,7 +17,7 @@ HEADERS += mediaplayer.h target.path = $$[QT_INSTALL_DEMOS]/qmediaplayer sources.files = $$SOURCES $$HEADERS $$FORMS $$RESOURCES *.pro *.html *.doc images -sources.path = $$[QT_INSTALL_DEMOS]/qmediaplayer qmediaplayer.pro +sources.path = $$[QT_INSTALL_DEMOS]/qmediaplayer INSTALLS += target sources wince*{ |