Ticket #13122: qt510-libs.patch

File qt510-libs.patch, 9.5 KB (added by Gary Buhrmaster <gary.buhrmaster@…>, 8 years ago)

patch for libs

  • mythtv/libs/libmyth/libmyth.pro 

    diff --git a/mythtv/libs/libmyth/libmyth.pro b/mythtv/libs/libmyth/libmyth.pro
index 24ec735b18..1fd5cc01c0 100644
    a b  
    11include ( ../../settings.pro )
    22
    33QT += network xml sql script
    4 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    54QT += widgets
    65android: QT += androidextras
    7 }
    86
    97TEMPLATE = lib
    108TARGET = myth-$$LIBVERSION
    … … unix:!cygwin {  
    177175    SOURCES += mediamonitor-unix.cpp
    178176    HEADERS += mediamonitor-unix.h
    179177    !android {
    180     contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    181178        using_qtdbus: QT += dbus
    182     } else {
    183         using_qtdbus: CONFIG += qdbus
    184     }
    185179    }
    186180}
    187181

  • mythtv/libs/libmyth/test/test_audioconvert/test_audioconvert.pro 

    diff --git a/mythtv/libs/libmyth/test/test_audioconvert/test_audioconvert.pro b/mythtv/libs/libmyth/test/test_audioconvert/test_audioconvert.pro
index 9e73a8ca23..d0d77e8027 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_audioconvert

  • mythtv/libs/libmyth/test/test_audioutils/test_audioutils.pro 

    diff --git a/mythtv/libs/libmyth/test/test_audioutils/test_audioutils.pro b/mythtv/libs/libmyth/test/test_audioutils/test_audioutils.pro
index 3d62f741cb..df659aeb19 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_audioutils

  • mythtv/libs/libmyth/test/test_programinfo/test_programinfo.pro 

    diff --git a/mythtv/libs/libmyth/test/test_programinfo/test_programinfo.pro b/mythtv/libs/libmyth/test/test_programinfo/test_programinfo.pro
index bfd9d24287..e59584844d 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_programinfo

  • mythtv/libs/libmythbase/libmythbase.pro 

    diff --git a/mythtv/libs/libmythbase/libmythbase.pro b/mythtv/libs/libmythbase/libmythbase.pro
index aa7ac151db..444abea063 100644
    a b win32-msvc* {  
    153153}
    154154
    155155QT += xml sql network
    156 
    157 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    158156QT += widgets
    159 }
    160157
    161158include ( ../libs-targetfix.pro )
    162159

  • mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro 

    diff --git a/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro b/mythtv/libs/libmythbase/test/test_mythsystem/test_mythsystem.pro
index fee4e38226..159dcb28f3 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_mythsystem

  • mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro 

    diff --git a/mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro b/mythtv/libs/libmythbase/test/test_mythsystemlegacy/test_mythsystemlegacy.pro
index b116e7a5ae..d97c6c8112 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_mythsystemlegacy

  • mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro 

    diff --git a/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro b/mythtv/libs/libmythbase/test/test_mythtimer/test_mythtimer.pro
index d0e332b74d..91c6a3f773 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    3 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    4 CONFIG += qtestlib
    5 }
    6 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    73QT += testlib
    8 }
    94
    105TEMPLATE = app
    116TARGET = test_mythtimer

  • mythtv/libs/libmythbase/test/test_template/test_template.pro 

    diff --git a/mythtv/libs/libmythbase/test/test_template/test_template.pro b/mythtv/libs/libmythbase/test/test_template/test_template.pro
index 2cf0a3e615..c8229039b7 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_template

  • mythtv/libs/libmythmetadata/libmythmetadata.pro 

    diff --git a/mythtv/libs/libmythmetadata/libmythmetadata.pro b/mythtv/libs/libmythmetadata/libmythmetadata.pro
index d06405c930..695900c985 100644
    a b  
    11include ( ../../settings.pro )
    22
    33QT += network xml sql
    4 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    54QT += widgets
    6 }
    75
    86TEMPLATE = lib
    97TARGET = mythmetadata-$$LIBVERSION

  • mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro 

    diff --git a/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro b/mythtv/libs/libmythmetadata/test/test_videometadata/test_videometadata.pro
index 218378d363..cc283b73c0 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_videometadata

  • mythtv/libs/libmythprotoserver/libmythprotoserver.pro 

    diff --git a/mythtv/libs/libmythprotoserver/libmythprotoserver.pro b/mythtv/libs/libmythprotoserver/libmythprotoserver.pro
index d9c5643ec8..a1d2446cc1 100644
    a b  
    11include ( ../../settings.pro )
    22
    33QT += network sql
    4 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    54QT += widgets
    6 }
    75
    86TEMPLATE = lib
    97TARGET = mythprotoserver-$$LIBVERSION

  • mythtv/libs/libmythtv/libmythtv.pro 

    diff --git a/mythtv/libs/libmythtv/libmythtv.pro b/mythtv/libs/libmythtv/libmythtv.pro
index 77dd7917a0..b88964a3ea 100644
    a b  
    11include ( ../../settings.pro )
    22
    33QT += network xml sql
    4 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    54QT += widgets
    6 }
    75
    86TEMPLATE = lib
    97TARGET = mythtv-$$LIBVERSION

  • mythtv/libs/libmythtv/test/test_copyframes/test_copyframes.pro 

    diff --git a/mythtv/libs/libmythtv/test/test_copyframes/test_copyframes.pro b/mythtv/libs/libmythtv/test/test_copyframes/test_copyframes.pro
index b365d57cd3..15a39d0986 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_copyframes

  • mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.pro 

    diff --git a/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.pro b/mythtv/libs/libmythtv/test/test_eitfixups/test_eitfixups.pro
index 6e8881b4eb..a6be44cc62 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_eitfixups

  • mythtv/libs/libmythtv/test/test_iptvrecorder/test_iptvrecorder.pro 

    diff --git a/mythtv/libs/libmythtv/test/test_iptvrecorder/test_iptvrecorder.pro b/mythtv/libs/libmythtv/test/test_iptvrecorder/test_iptvrecorder.pro
index c051d80319..bbc9e89a46 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_iptvrecorder

  • mythtv/libs/libmythtv/test/test_mpegtables/test_mpegtables.pro 

    diff --git a/mythtv/libs/libmythtv/test/test_mpegtables/test_mpegtables.pro b/mythtv/libs/libmythtv/test/test_mpegtables/test_mpegtables.pro
index 62f3124bb5..b280b0eaa7 100644
    a b  
    11include ( ../../../../settings.pro )
    22
    33QT += xml sql network
    4 
    5 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    6 CONFIG += qtestlib
    7 }
    8 contains(QT_VERSION, ^5\\.[0-9]\\..*) {
    94QT += testlib
    10 }
    115
    126TEMPLATE = app
    137TARGET = test_mpegtables

  • mythtv/libs/libmythui/libmythui.pro 

    diff --git a/mythtv/libs/libmythui/libmythui.pro b/mythtv/libs/libmythui/libmythui.pro
index 6b534ad2c2..092098dd4a 100644
    a b  
    11include ( ../../settings.pro )
    22
    33QT += xml sql network opengl
    4 contains(QT_VERSION, ^4\\.[0-9]\\..*) {
    5 QT += webkit
    6 }
    7 contains(QT_VERSION, ^5\\.[0-9]\\..*):using_qtwebkit {
     4using_qtwebkit {
    85QT += widgets
    96QT += webkitwidgets
    107android: QT += androidextras