Ticket #11243: 0002-qt5-libmythupnp.patch

File 0002-qt5-libmythupnp.patch, 1.5 KB (added by anonymous, 14 years ago)

  • mythtv/libs/libmythupnp/servicehost.cpp 

    diff --git a/mythtv/libs/libmythupnp/servicehost.cpp b/mythtv/libs/libmythupnp/servicehost.cpp
index 024acb9..cb8013c 100644
    a b QVariant MethodInfo::Invoke( Service *pService, const QStringMap &reqParams )  
    6565
    6666        if (nRetIdx != 0)
    6767        {
     68#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    6869            param[ 0 ] = QMetaType::construct( nRetIdx );   
     70#else
     71            param[ 0 ] = QMetaType::create( nRetIdx );
     72#endif
    6973            types[ 0 ] = nRetIdx;
    7074        }
    7175        else
    … … QVariant MethodInfo::Invoke( Service *pService, const QStringMap &reqParams )  
    8892
    8993            if (nId != 0)
    9094            {
     95#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    9196                pParam = QMetaType::construct( nId );
     97#else
     98                pParam = QMetaType::create( nId );
     99#endif
    92100            }
    93101            else
    94102            {

  • mythtv/libs/libmythupnp/xsd.cpp 

    diff --git a/mythtv/libs/libmythupnp/xsd.cpp b/mythtv/libs/libmythupnp/xsd.cpp
index 9636121..d433316 100644
    a b bool Xsd::GetXSD( HTTPRequest *pRequest, QString sTypeName )  
    9494    }
    9595    else
    9696    {
     97#if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
    9798        QObject *pClass = (QObject *)QMetaType::construct( id );
     99#else
     100        QObject *pClass = (QObject *)QMetaType::create( id );
     101#endif
    98102
    99103        if (pClass != NULL)
    100104            bHandled = RenderXSD( pRequest, pClass );