Move define to allow Qt5 deprecated methods to ./configure.

MythTV · Mar 1, 2013 · 85f5e1a · 85f5e1a
1 parent 2e9b97e
commit 85f5e1a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/mythtv/configure b/mythtv/configure
@@ -4227,7 +4227,7 @@ if ! is_qmake5 $qmake ; then
       die "Qt4.8 or newer is required to build MythTV."
   fi
 else
-    check_cxxflags -DHAVE_QT5
+    check_cxxflags -DQT_DISABLE_DEPRECATED_BEFORE
 fi
 
 if test x"$qmakespecs" != x; then

diff --git a/mythtv/settings.pro b/mythtv/settings.pro
@@ -171,7 +171,3 @@ EXTRA_LIBS += -L$$SRC_PATH_BARE/external/nzmqt/src -lmythnzmqt
 EXTRA_LIBS += -L$$SRC_PATH_BARE/external/qjson/lib -lmythqjson
 
 macx:using_firewire:using_backend:EXTRA_LIBS += -F$${CONFIG_MAC_AVC} -framework AVCVideoServices
-
-contains(QT_VERSION, ^5\\.[0-9]\\..*) {
-DEFINES += QT_DISABLE_DEPRECATED_BEFORE
-}