Convert various .pro files to work with Qt5.

MythTV · Mar 8, 2013 · 5733022 · 5733022
1 parent a61188c
commit 5733022
Show file tree

Hide file tree

Showing 21 changed files with 92 additions and 12 deletions.
diff --git a/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro b/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro
@@ -1,6 +1,12 @@
 include ( ../../../../settings.pro )
 
+contains(QT_VERSION, ^4\\.[0-9]\\..*) {
 CONFIG += qtestlib
+}
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += testlib
+}
+
 TEMPLATE = app
 TARGET = test_mythtimer
 DEPENDPATH += . ../..
@@ -15,8 +21,8 @@ contains(QMAKE_CXX, "g++") {
 HEADERS += test_mythtimer.h
 SOURCES += test_mythtimer.cpp
 
-HEADERS += mythtimer.h
-SOURCES += mythtimer.cpp
+HEADERS += ../../mythtimer.h
+SOURCES += ../../mythtimer.cpp
 
 QMAKE_CLEAN += $(TARGET) $(TARGETA) $(TARGETD) $(TARGET0) $(TARGET1) $(TARGET2)
 QMAKE_CLEAN += ; rm -f *.gcov *.gcda *.gcno

diff --git a/mythtv/libs/libmythmetadata/libmythmetadata.pro b/mythtv/libs/libmythmetadata/libmythmetadata.pro
@@ -1,5 +1,10 @@
 include ( ../../settings.pro )
 
+QT += network xml sql
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
+
 TEMPLATE = lib
 TARGET = mythmetadata-$$LIBVERSION
 CONFIG += thread dll
@@ -70,8 +75,6 @@ macx {
     using_firewire:using_backend:LIBS += -F$${CONFIG_MAC_AVC} -framework AVCVideoServices
 }
 
-QT += network xml sql
-
 use_hidesyms {
     QMAKE_CXXFLAGS += -fvisibility=hidden
 }

diff --git a/mythtv/libs/libmythprotoserver/libmythprotoserver.pro b/mythtv/libs/libmythprotoserver/libmythprotoserver.pro
@@ -1,6 +1,9 @@
 include ( ../../settings.pro )
 
 QT += network sql
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = lib
 TARGET = mythprotoserver-$$LIBVERSION

diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
@@ -1,6 +1,9 @@
 include ( ../../settings.pro )
 
 QT += network xml sql
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = lib
 TARGET = mythtv-$$LIBVERSION

diff --git a/mythtv/libs/libmythui/libmythui.pro b/mythtv/libs/libmythui/libmythui.pro
@@ -1,5 +1,14 @@
 include ( ../../settings.pro )
 
+QT += xml sql network
+contains(QT_VERSION, ^4\\.[0-9]\\..*) {
+QT += webkit
+}
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+# QT += webkitwidgets # this does not seem to work.. 
+}
+
 TEMPLATE = lib
 TARGET = mythui-$$LIBVERSION
 CONFIG += thread dll
@@ -42,7 +51,7 @@ SOURCES += mythuistatetype.cpp mythfontproperties.cpp
 SOURCES += mythuibutton.cpp myththemedmenu.cpp mythdialogbox.cpp
 SOURCES += mythuiclock.cpp mythuitextedit.cpp mythprogressdialog.cpp
 SOURCES += mythuispinbox.cpp mythuicheckbox.cpp mythuibuttonlist.cpp
-SOURCES += mythuigroup.cpp mythuiprogressbar.cpp mythuiwebbrowser.cpp
+SOURCES += mythuigroup.cpp mythuiprogressbar.cpp
 SOURCES += screensaver.cpp screensaver-null.cpp x11colors.cpp
 SOURCES += themeinfo.cpp mythxdisplay.cpp DisplayRes.cpp DisplayResScreen.cpp
 SOURCES += mythgenerictree.cpp mythuibuttontree.cpp mythuiutils.cpp
@@ -52,6 +61,10 @@ SOURCES += mythdisplay.cpp mythuivideo.cpp mythudplistener.cpp
 SOURCES += mythuisimpletext.cpp mythuistatetracker.cpp
 SOURCES += mythuianimation.cpp mythuiscrollbar.cpp
 
+contains(QT_VERSION, ^4\\.[0-9]\\..*) {
+SOURCES += mythuiwebbrowser.cpp
+}
+
 inc.path = $${PREFIX}/include/mythtv/libmythui/
 
 inc.files  = mythrect.h mythmainwindow.h mythpainter.h mythimage.h
@@ -164,7 +177,6 @@ using_opengl {
     mingw:LIBS += -lopengl32
 }
 
-QT += xml sql network webkit
 DEFINES += USING_QTWEBKIT
 DEFINES += MUI_API
 

diff --git a/mythtv/programs/mythavtest/mythavtest.pro b/mythtv/programs/mythavtest/mythavtest.pro
@@ -3,6 +3,9 @@ include ( ../../version.pro )
 include ( ../programs-libs.pro )
 
 QT += network xml sql
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread

diff --git a/mythtv/programs/mythbackend/mythbackend.pro b/mythtv/programs/mythbackend/mythbackend.pro
@@ -3,6 +3,9 @@ include ( ../../version.pro )
 include ( ../programs-libs.pro )
 
 QT += network xml sql script
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread

diff --git a/mythtv/programs/mythccextractor/mythccextractor.pro b/mythtv/programs/mythccextractor/mythccextractor.pro
@@ -2,6 +2,9 @@ include (../../settings.pro)
 include ( ../programs-libs.pro )
 
 QT += sql network
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread

diff --git a/mythtv/programs/mythcommflag/mythcommflag.pro b/mythtv/programs/mythcommflag/mythcommflag.pro
@@ -2,6 +2,10 @@ include (../../settings.pro)
 include (../../version.pro)
 include ( ../programs-libs.pro )
 
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
+
 TEMPLATE = app
 CONFIG += thread
 target.path = $${PREFIX}/bin

diff --git a/mythtv/programs/mythfilldatabase/mythfilldatabase.pro b/mythtv/programs/mythfilldatabase/mythfilldatabase.pro
@@ -3,6 +3,9 @@ include ( ../../version.pro )
 include ( ../programs-libs.pro )
 
 QT += network xml sql
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread

diff --git a/mythtv/programs/mythfrontend/mythfrontend.pro b/mythtv/programs/mythfrontend/mythfrontend.pro
@@ -2,11 +2,18 @@ include ( ../../settings.pro )
 include ( ../../version.pro )
 include ( ../programs-libs.pro )
 
-QT += network xml sql webkit script
+QT += network xml sql script
+contains(QT_VERSION, ^4\\.[0-9]\\..*) {
+QT += webkit
+using_qtdbus: CONFIG += qdbus
+}
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+using_qtdbus: QT += dbus
+}
 
 TEMPLATE = app
 CONFIG += thread
-using_qtdbus: CONFIG += qdbus
 TARGET = mythfrontend
 target.path = $${PREFIX}/bin
 INSTALLS = target

diff --git a/mythtv/programs/mythjobqueue/mythjobqueue.pro b/mythtv/programs/mythjobqueue/mythjobqueue.pro
@@ -3,6 +3,10 @@ include ( ../../version.pro)
 include ( ../programs-libs.pro)
 
 QT += sql network
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
+
 CONFIG -= opengl
 
 TEMPLATE = app

diff --git a/mythtv/programs/mythlcdserver/mythlcdserver.pro b/mythtv/programs/mythlcdserver/mythlcdserver.pro
@@ -2,6 +2,12 @@ include ( ../../settings.pro )
 include ( ../../version.pro )
 include ( ../programs-libs.pro )
 
+QT += network xml sql
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
+using_opengl:QT += opengl
+
 TEMPLATE = app
 CONFIG += thread
 TARGET = mythlcdserver
@@ -12,7 +18,3 @@ INSTALLS += target
 HEADERS += lcdserver.h  lcdprocclient.h commandlineparser.h
 
 SOURCES += main.cpp lcdserver.cpp lcdprocclient.cpp commandlineparser.cpp
-
-QT += network xml sql
-
-using_opengl:QT += opengl
diff --git a/mythtv/programs/mythlogserver/mythlogserver.pro b/mythtv/programs/mythlogserver/mythlogserver.pro
@@ -2,6 +2,9 @@ include (../../settings.pro)
 include ( ../programs-libs.pro )
 
 QT += sql network
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread

diff --git a/mythtv/programs/mythmediaserver/mythmediaserver.pro b/mythtv/programs/mythmediaserver/mythmediaserver.pro
@@ -3,6 +3,9 @@ include ( ../../version.pro )
 include ( ../programs-libs.pro )
 
 QT += network sql
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread

diff --git a/mythtv/programs/mythpreviewgen/mythpreviewgen.pro b/mythtv/programs/mythpreviewgen/mythpreviewgen.pro
@@ -3,6 +3,9 @@ include ( ../../version.pro )
 include ( ../programs-libs.pro )
 
 QT += network sql
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread

diff --git a/mythtv/programs/mythscreenwizard/mythscreenwizard.pro b/mythtv/programs/mythscreenwizard/mythscreenwizard.pro
@@ -3,6 +3,9 @@ include ( ../../version.pro)
 include ( ../programs-libs.pro)
 
 QT += sql network
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread

diff --git a/mythtv/programs/mythtranscode/mythtranscode.pro b/mythtv/programs/mythtranscode/mythtranscode.pro
@@ -3,6 +3,9 @@ include ( ../../version.pro)
 include ( ../programs-libs.pro)
 
 QT += network xml sql
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread

diff --git a/mythtv/programs/mythtv-setup/mythtv-setup.pro b/mythtv/programs/mythtv-setup/mythtv-setup.pro
@@ -3,6 +3,9 @@ include ( ../../version.pro )
 include ( ../programs-libs.pro )
 
 QT += network xml sql
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 INCLUDEPATH += ../../libs/libmythtv/channelscan
 DEPENDPATH += ../../libs/libmythtv/channelscan

diff --git a/mythtv/programs/mythutil/mythutil.pro b/mythtv/programs/mythutil/mythutil.pro
@@ -3,6 +3,9 @@ include ( ../../version.pro )
 include ( ../programs-libs.pro )
 
 QT += network sql xml
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread

diff --git a/mythtv/programs/mythwelcome/mythwelcome.pro b/mythtv/programs/mythwelcome/mythwelcome.pro
@@ -3,6 +3,9 @@ include (../../version.pro)
 include (../programs-libs.pro)
 
 QT += xml sql network
+contains(QT_VERSION, ^5\\.[0-9]\\..*) {
+QT += widgets
+}
 
 TEMPLATE = app
 CONFIG += thread