Ignore:
Timestamp:
Mar 16, 2012, 4:02:47 PM (13 years ago)
Author:
Silvan Scherrer
Message:

SMPlayer: 0.7.1 trunk update

Location:
smplayer/trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • smplayer/trunk

  • smplayer/trunk/src/smplayer.pro

    r119 r124  
    88RESOURCES = icons.qrc
    99
    10 INCLUDEPATH += findsubtitles videopreview mpcgui
    11 DEPENDPATH += findsubtitles videopreview mpcgui
    12 
    13 #DEFINES += USE_QXT
     10INCLUDEPATH += findsubtitles videopreview mpcgui youtube
     11DEPENDPATH += findsubtitles videopreview mpcgui youtube
     12
     13DEFINES += USE_QTLOCKEDFILE
    1414
    1515DEFINES += DOWNLOAD_SUBS
     
    5151        recents.h \
    5252        urlhistory.h \
     53        youtube/retrieveyoutubeurl.h \
    5354        core.h \
    5455        logwindow.h \
     
    6162        vdpauproperties.h \
    6263        preferencesdialog.h \
     64        lineedit_with_icon.h \
     65        mylineedit.h \
    6366        mycombobox.h \
    6467        tristatecombo.h \
     
    148151        recents.cpp \
    149152        urlhistory.cpp \
     153        youtube/retrieveyoutubeurl.cpp \
    150154        core.cpp \
    151155        logwindow.cpp \
     
    158162        vdpauproperties.cpp \
    159163        preferencesdialog.cpp \
     164        lineedit_with_icon.cpp \
     165        mylineedit.cpp \
    160166        mycombobox.cpp \
    161167        tristatecombo.cpp \
     
    214220        main.cpp
    215221
    216 #libqxt
    217 contains(DEFINES, USE_QXT) {
    218         CONFIG  += qxt
    219         QXT     += core
     222contains(DEFINES, USE_QTLOCKEDFILE) {
     223        HEADERS += qtlockedfile/qtlockedfile.h
     224        SOURCES += qtlockedfile/qtlockedfile.cpp
     225        unix:SOURCES += qtlockedfile/qtlockedfile_unix.cpp
     226        win32:SOURCES += qtlockedfile/qtlockedfile_win.cpp
     227        os2:SOURCES += qtlockedfile/qtlockedfile_unix.cpp
    220228}
    221229
     
    226234        prefplaylist.ui preftv.ui favoriteeditor.ui \
    227235        about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \
    228         filechooser.ui \
    229236        findsubtitles/findsubtitleswindow.ui findsubtitles/findsubtitlesconfigdialog.ui \
    230237        videopreview/videopreviewconfigdialog.ui
     
    248255               translations/smplayer_gl.ts translations/smplayer_vi_VN.ts \
    249256               translations/smplayer_et.ts translations/smplayer_lt.ts \
    250                translations/smplayer_da.ts
     257               translations/smplayer_da.ts translations/smplayer_hr.ts
    251258
    252259contains( DEFINES, DOWNLOAD_SUBS ) {
     
    278285       
    279286        win32 {
    280                 INCLUDEPATH += c:\development\zlib-1.2.3
    281                 LIBS += -Lc:\development\zlib-1.2.3
     287                INCLUDEPATH += ..\\zlib-1.2.6
     288                LIBS += -L..\\zlib-1.2.6
    282289        }
    283290}
Note: See TracChangeset for help on using the changeset viewer.