Changeset 561 for trunk/demos/qmediaplayer

Timestamp:

Feb 11, 2010, 11:19:06 PM (16 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• demos/qmediaplayer (copied) (copied from branches/vendor/nokia/qt/4.6.1/demos/qmediaplayer )
• demos/qmediaplayer/images (copied) (copied from branches/vendor/nokia/qt/4.6.1/demos/qmediaplayer/images )
• demos/qmediaplayer/images/screen.png (copied) (copied from branches/vendor/nokia/qt/4.6.1/demos/qmediaplayer/images/screen.png )
• demos/qmediaplayer/main.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/demos/qmediaplayer/main.cpp )
• demos/qmediaplayer/mediaplayer.cpp (copied) (copied from branches/vendor/nokia/qt/4.6.1/demos/qmediaplayer/mediaplayer.cpp )
• demos/qmediaplayer/mediaplayer.h (copied) (copied from branches/vendor/nokia/qt/4.6.1/demos/qmediaplayer/mediaplayer.h )
• demos/qmediaplayer/mediaplayer.qrc (copied) (copied from branches/vendor/nokia/qt/4.6.1/demos/qmediaplayer/mediaplayer.qrc )
• demos/qmediaplayer/qmediaplayer.pro (copied) (copied from branches/vendor/nokia/qt/4.6.1/demos/qmediaplayer/qmediaplayer.pro )
• demos/qmediaplayer/settings.ui (copied) (copied from branches/vendor/nokia/qt/4.6.1/demos/qmediaplayer/settings.ui )