Ignore:
Timestamp:
May 5, 2011, 5:36:53 AM (14 years ago)
Author:
Dmitry A. Kuminov
Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk

  • trunk/src/3rdparty/phonon/phonon/seekslider.cpp

    r561 r846  
    7373
    7474    if (media) {
    75         connect(media, SIGNAL(stateChanged(Phonon::State,Phonon::State)),
     75        connect(media, SIGNAL(stateChanged(Phonon::State, Phonon::State)),
    7676                SLOT(_k_stateChanged(Phonon::State)));
    7777        connect(media, SIGNAL(totalTimeChanged(qint64)), SLOT(_k_length(qint64)));
    7878        connect(media, SIGNAL(tick(qint64)), SLOT(_k_tick(qint64)));
    7979        connect(media, SIGNAL(seekableChanged(bool)), SLOT(_k_seekableChanged(bool)));
    80         connect(media, SIGNAL(currentSourceChanged(Phonon::MediaSource)), SLOT(_k_currentSourceChanged()));
     80        connect(media, SIGNAL(currentSourceChanged(const Phonon::MediaSource&)), SLOT(_k_currentSourceChanged()));
    8181        d->_k_stateChanged(media->state());
    8282        d->_k_seekableChanged(media->isSeekable());
Note: See TracChangeset for help on using the changeset viewer.