diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-07 20:46:03 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-06-07 20:46:03 +1000 |
| commit | e49b63f0ff2ceb8e472116a1a89c9122baff4974 (patch) | |
| tree | febbc0c16d353eb4113c164e5498eaa495849394 /src/plugins/phonon/qt7/qt7.pro | |
| parent | db5f67926ebb5430cc75d00a8d39614c9ce5cda0 (diff) | |
| parent | 9fe3d5c071732e945c7357074fed054ca28188cf (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtphonon-staging:
Use feature profile loading instead of direct inclusion.
Fixed DESTDIR after modularization.
Diffstat (limited to 'src/plugins/phonon/qt7/qt7.pro')
| -rw-r--r-- | src/plugins/phonon/qt7/qt7.pro | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/phonon/qt7/qt7.pro b/src/plugins/phonon/qt7/qt7.pro index d00ba88..db6b6d0 100644 --- a/src/plugins/phonon/qt7/qt7.pro +++ b/src/plugins/phonon/qt7/qt7.pro @@ -75,4 +75,4 @@ OBJECTIVE_SOURCES += $$PHONON_QUICKTIME_DIR/quicktimevideoplayer.mm \ target.path = $$[QT_INSTALL_PLUGINS]/phonon_backend INSTALLS += target -include($$QT_SOURCE_TREE/src/plugins/qpluginbase.pri) +load(qt_plugin) |