Skip to content

Commit

Permalink
do not build xv for Qt5. We'd better use x11 instead of QX11Info
Browse files Browse the repository at this point in the history
  • Loading branch information
wang-bin committed Apr 5, 2013
1 parent efdb1d5 commit 26c063c
Showing 1 changed file with 7 additions and 9 deletions.
16 changes: 7 additions & 9 deletions QtAV.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TEMPLATE = subdirs
CONFIG += ordered
SUBDIRS = libqtav
SUBDIRS = libqtav examples tests

libqtav.file = src/libQtAV.pro
examples.depends += libqtav
Expand Down Expand Up @@ -62,12 +62,12 @@ cache(SOURCE_ROOT, set, SOURCE_ROOT)
cache(mkspecs_cached, set, mkspecs_build)

EssentialDepends = avutil avcodec avformat swscale
OptionalDepends = portaudio direct2d gdiplus gl #openal

greaterThan(QT_MAJOR_VERSION, 4) {
OptionalDepends = portaudio direct2d gdiplus gl #openal
}
else{
OptionalDepends = portaudio direct2d gdiplus xv gl #openal
unix {
isEqual(QT_MAJOR_VERSION, 4) {
OptionalDepends += xv
}
}

for(d, EssentialDepends) {
Expand All @@ -79,9 +79,7 @@ for(d, EssentialDepends) {
}
message("checking for optional features...")
for(d, OptionalDepends) {
message("checking for $$d optional features...")
qtCompileTest($$d)|warning("$$d is optional , the compiler can not find it")
message("Config: $$CONFIG ...")
qtCompileTest($$d)
}


Expand Down

0 comments on commit 26c063c

Please sign in to comment.