Permalink
Browse files

Disable some Qt5 incompatible stuff under Qt5.

  • Loading branch information...
daniel-kristjansson authored and jyavenard committed Feb 24, 2013
1 parent 0cd8644 commit 31f3ff880291747a0bc5ac93ba8f757963fab145
Showing with 21 additions and 7 deletions.
  1. +16 −6 mythtv/libs/libmyth/libmyth.pro
  2. +5 −1 mythtv/libs/libmythbase/libmythbase.pro
@@ -36,8 +36,7 @@ HEADERS += remoteutil.h
HEADERS += rawsettingseditor.h
HEADERS += programinfo.h programinfoupdater.h
HEADERS += programtypes.h recordingtypes.h
HEADERS += mythrssmanager.h netgrabbermanager.h
HEADERS += rssparse.h netutils.h
HEADERS += rssparse.h
# remove when everything is switched to mythui
HEADERS += virtualkeyboard_qt.h uitypes.h xmlparse.h
@@ -63,12 +62,18 @@ SOURCES += remoteutil.cpp
SOURCES += rawsettingseditor.cpp
SOURCES += programinfo.cpp programinfoupdater.cpp
SOURCES += programtypes.cpp recordingtypes.cpp
SOURCES += mythrssmanager.cpp netgrabbermanager.cpp
SOURCES += rssparse.cpp netutils.cpp
SOURCES += rssparse.cpp
# remove when everything is switched to mythui
SOURCES += virtualkeyboard_qt.cpp uitypes.cpp xmlparse.cpp
# This stuff is not Qt5 compatible..
contains(QT_VERSION, ^4\\.[0-9]\\..*) {
HEADERS += mythrssmanager.h netutils.h
HEADERS += netgrabbermanager.h
SOURCES += mythrssmanager.cpp netutils.cpp
SOURCES += netgrabbermanager.cpp
}
INCLUDEPATH += ../libmythsamplerate ../libmythsoundtouch ../libmythfreesurround
INCLUDEPATH += ../libmythbase
@@ -115,8 +120,13 @@ inc.files += mythconfigdialogs.h mythconfiggroups.h
inc.files += mythterminal.h remoteutil.h
inc.files += programinfo.h
inc.files += programtypes.h recordingtypes.h
inc.files += mythrssmanager.h netgrabbermanager.h
inc.files += rssparse.h netutils.h
inc.files += rssparse.h
# This stuff is not Qt5 compatible..
contains(QT_VERSION, ^4\\.[0-9]\\..*) {
inc.files += mythrssmanager.h netutils.h
inc.files += netgrabbermanager.h
}
# remove when everything is switched to mythui
inc.files += virtualkeyboard_qt.h xmlparse.h
@@ -48,7 +48,6 @@ SOURCES += mythplugin.cpp
contains(QT_VERSION, ^4\\.[0-9]\\..*) {
HEADERS += httpcomms.h mcodecs.h mythhttppool.h mythhttphandler.h
SOURCES += httpcomms.cpp mcodecs.cpp mythhttppool.cpp mythhttphandler.cpp
inc.files += httpcomms.h mythhttppool.h
}
unix {
@@ -77,6 +76,11 @@ inc.files += filesysteminfo.h hardwareprofile.h bonjourregister.h serverpool.h
inc.files += plist.h bswap.h signalhandling.h ffmpeg-mmx.h mythdate.h
inc.files += mythplugin.h mythpluginapi.h
# This stuff is not Qt5 compatible..
contains(QT_VERSION, ^4\\.[0-9]\\..*) {
inc.files += httpcomms.h mythhttppool.h
}
# Allow both #include <blah.h> and #include <libmythbase/blah.h>
inc2.path = $${PREFIX}/include/mythtv/libmythbase
inc2.files = $${inc.files}

0 comments on commit 31f3ff8

Please sign in to comment.