diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 11:18:54 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-24 11:18:54 (GMT) |
| commit | 3dd48b423b3651e296d845cf734347bfb48d3137 (patch) | |
| tree | a88684f5528ea6c2fb33e2eae3f856de0e2604e5 | |
| parent | 4d615766184e3eeee25ffc634847bec1edd47ac0 (diff) | |
| parent | 63cb5d9dea14050db706ca69880a494db5a3c547 (diff) | |
| download | Qt-3dd48b423b3651e296d845cf734347bfb48d3137.zip Qt-3dd48b423b3651e296d845cf734347bfb48d3137.tar.gz Qt-3dd48b423b3651e296d845cf734347bfb48d3137.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/berlin-staging-1:
compile fix with namespaces after a broken automatical merge
| -rw-r--r-- | src/multimedia/base/qmediaserviceprovider.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/multimedia/base/qmediaserviceprovider.cpp b/src/multimedia/base/qmediaserviceprovider.cpp index 76377d9..02c9b29 100644 --- a/src/multimedia/base/qmediaserviceprovider.cpp +++ b/src/multimedia/base/qmediaserviceprovider.cpp @@ -594,8 +594,6 @@ QMediaServiceProvider *QMediaServiceProvider::defaultServiceProvider() #endif } -QT_END_NAMESPACE - /*! \class QMediaServiceProviderPlugin \preliminary |