diff --git a/src/src.pro b/src/src.pro index 90ee29ff5..ecfd7c2ca 100644 --- a/src/src.pro +++ b/src/src.pro @@ -170,8 +170,9 @@ macx { } else { - contains(DEFINES, "GC_VIDEO_NONE") { + contains(DEFINES, "GC_VIDEO_NONE")|contains(DEFINES, "GC_VIDEO_QT5") { + # GC_VIDEO_QT5 will enable Qt5 video support, otherwise # we have a blank videowindow, it will do nothing HEADERS += Train/VideoWindow.h SOURCES += Train/VideoWindow.cpp diff --git a/travis/osx/before_script.sh b/travis/osx/before_script.sh index a240dbbf9..245722a4c 100755 --- a/travis/osx/before_script.sh +++ b/travis/osx/before_script.sh @@ -46,8 +46,8 @@ sed -i "" "s|#\(LMFIT_INSTALL =\).*|\1 /usr/local|" src/gcconfig.pri sed -i "" "s|#\(DEFINES += GC_HAVE_LION*\)|\1|" src/gcconfig.pri sed -i "" "s|#\(HTPATH = ../httpserver.*\)|\1 |" src/gcconfig.pri sed -i "" "s|#\(DEFINES += GC_WANT_ROBOT.*\)|\1 |" src/gcconfig.pri -##sed -i "" "s|\(DEFINES += GC_VIDEO_NONE.*\)|#\1 |" src/gcconfig.pri ## we want this for now XXX till AVKit fixup -##sed -i "" "s|#\(DEFINES += GC_VIDEO_QUICKTIME.*\)|\1 |" src/gcconfig.pri ## QT is deprecated, don't build with it. +sed -i "" "s|\(DEFINES += GC_VIDEO_NONE.*\)|#\1 |" src/gcconfig.pri +sed -i "" "s|#\(DEFINES += GC_VIDEO_QT5.*\)|\1 |" src/gcconfig.pri ## we want this for now till AVKit fixup ##Issues with c++11 and stdlib on travis and dependencies sed -i "" "s|#\(DEFINES += GC_WANT_R.*\)|\1 |" src/gcconfig.pri echo "QMAKE_CFLAGS_RELEASE += -mmacosx-version-min=10.7 -arch x86_64" >> src/gcconfig.pri