Changeset 124 for smplayer/trunk/src/smplayer.pro
- Timestamp:
- Mar 16, 2012, 4:02:47 PM (13 years ago)
- Location:
- smplayer/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
smplayer/trunk
- Property svn:mergeinfo changed
/smplayer/vendor/current merged: 121-122
- Property svn:mergeinfo changed
-
smplayer/trunk/src/smplayer.pro
r119 r124 8 8 RESOURCES = icons.qrc 9 9 10 INCLUDEPATH += findsubtitles videopreview mpcgui 11 DEPENDPATH += findsubtitles videopreview mpcgui 12 13 #DEFINES += USE_QXT 10 INCLUDEPATH += findsubtitles videopreview mpcgui youtube 11 DEPENDPATH += findsubtitles videopreview mpcgui youtube 12 13 DEFINES += USE_QTLOCKEDFILE 14 14 15 15 DEFINES += DOWNLOAD_SUBS … … 51 51 recents.h \ 52 52 urlhistory.h \ 53 youtube/retrieveyoutubeurl.h \ 53 54 core.h \ 54 55 logwindow.h \ … … 61 62 vdpauproperties.h \ 62 63 preferencesdialog.h \ 64 lineedit_with_icon.h \ 65 mylineedit.h \ 63 66 mycombobox.h \ 64 67 tristatecombo.h \ … … 148 151 recents.cpp \ 149 152 urlhistory.cpp \ 153 youtube/retrieveyoutubeurl.cpp \ 150 154 core.cpp \ 151 155 logwindow.cpp \ … … 158 162 vdpauproperties.cpp \ 159 163 preferencesdialog.cpp \ 164 lineedit_with_icon.cpp \ 165 mylineedit.cpp \ 160 166 mycombobox.cpp \ 161 167 tristatecombo.cpp \ … … 214 220 main.cpp 215 221 216 #libqxt 217 contains(DEFINES, USE_QXT) { 218 CONFIG += qxt 219 QXT += core 222 contains(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 220 228 } 221 229 … … 226 234 prefplaylist.ui preftv.ui favoriteeditor.ui \ 227 235 about.ui inputmplayerversion.ui errordialog.ui timedialog.ui \ 228 filechooser.ui \229 236 findsubtitles/findsubtitleswindow.ui findsubtitles/findsubtitlesconfigdialog.ui \ 230 237 videopreview/videopreviewconfigdialog.ui … … 248 255 translations/smplayer_gl.ts translations/smplayer_vi_VN.ts \ 249 256 translations/smplayer_et.ts translations/smplayer_lt.ts \ 250 translations/smplayer_da.ts 257 translations/smplayer_da.ts translations/smplayer_hr.ts 251 258 252 259 contains( DEFINES, DOWNLOAD_SUBS ) { … … 278 285 279 286 win32 { 280 INCLUDEPATH += c:\development\zlib-1.2.3281 LIBS += -L c:\development\zlib-1.2.3287 INCLUDEPATH += ..\\zlib-1.2.6 288 LIBS += -L..\\zlib-1.2.6 282 289 } 283 290 }
Note:
See TracChangeset
for help on using the changeset viewer.