diff options
author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 08:19:49 (GMT) |
---|---|---|
committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-05-19 08:19:49 (GMT) |
commit | de0858687898f6e0e54cce3f986779c7aa1a350e (patch) | |
tree | db90ba9785f4492dac7971bbc060be81605b6802 /src/plugins/mediaservices/symbian/mediaplayer/ms60mediaplayerresolver.h | |
parent | 85611635a3589d56c2670445ea5272e864e57a98 (diff) | |
parent | 650fefd7e25b10d88048d2a465a27c479d80636d (diff) | |
download | Qt-de0858687898f6e0e54cce3f986779c7aa1a350e.zip Qt-de0858687898f6e0e54cce3f986779c7aa1a350e.tar.gz Qt-de0858687898f6e0e54cce3f986779c7aa1a350e.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:
removed test file, part of mediaservice removal.
Rebuild configure.exe
Rebuild configure following the removal of media services.
More mediaservices removal work.
Removed mediaservices.
Diffstat (limited to 'src/plugins/mediaservices/symbian/mediaplayer/ms60mediaplayerresolver.h')
-rw-r--r-- | src/plugins/mediaservices/symbian/mediaplayer/ms60mediaplayerresolver.h | 58 |
1 files changed, 0 insertions, 58 deletions
diff --git a/src/plugins/mediaservices/symbian/mediaplayer/ms60mediaplayerresolver.h b/src/plugins/mediaservices/symbian/mediaplayer/ms60mediaplayerresolver.h deleted file mode 100644 index b655a83..0000000 --- a/src/plugins/mediaservices/symbian/mediaplayer/ms60mediaplayerresolver.h +++ /dev/null @@ -1,58 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the plugins of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the Technology Preview License Agreement accompanying -** this package. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -** -** -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -#ifndef MS60MEDIAPLAYERRESOLVER_H -#define MS60MEDIAPLAYERRESOLVER_H - -QT_BEGIN_NAMESPACE - -class S60MediaPlayerSession; - -class MS60MediaPlayerResolver -{ - public: - virtual S60MediaPlayerSession* PlayerSession() = 0; - virtual S60MediaPlayerSession* VideoPlayerSession() = 0; - virtual S60MediaPlayerSession* AudioPlayerSession() = 0; -}; - -QT_END_NAMESPACE - -#endif |