From: Till Theato Date: Mon, 3 Jan 2011 13:50:16 +0000 (+0000) Subject: Fix build with Qt < 4.6: X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=797b2ef6eebd0ebb1e5aef7d6f6e8e9a9bb3ab20;p=kdenlive Fix build with Qt < 4.6: http://kdenlive.org/mantis/view.php?id=1958 svn path=/trunk/kdenlive/; revision=5246 --- diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index 542e6b35..d436860a 100644 --- a/src/dvdwizard.cpp +++ b/src/dvdwizard.cpp @@ -486,9 +486,15 @@ void DvdWizard::generateDvd() m_creationLog.clear(); m_dvdauthor = new QProcess(this); // Set VIDEO_FORMAT variable (required by dvdauthor 0.7) +#if QT_VERSION >= 0x040600 QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); env.insert("VIDEO_FORMAT", m_pageVob->isPal() ? "PAL" : "NTSC"); m_dvdauthor->setProcessEnvironment(env); +#else + QStringList env = QProcess::systemEnvironment(); + env << "VIDEO_FORMAT=" + (m_pageVob->isPal() ? "PAL" : "NTSC"); + m_dvdauthor->setEnvironment(env); +#endif connect(m_dvdauthor, SIGNAL(finished(int , QProcess::ExitStatus)), this, SLOT(slotRenderFinished(int, QProcess::ExitStatus))); connect(m_dvdauthor, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowRenderInfo())); m_dvdauthor->setProcessChannelMode(QProcess::MergedChannels);