From 003860b5a74f833f13ae2572924e5b2d34b919b4 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 28 Nov 2012 11:04:22 +0100 Subject: fixqt4headers: Remove QtQuick1 and add QtMultimedia QtQuick1 is QtDeclarative again, so there's no header file renaming needed. But Multimedia got renamed from multimediakit and this needs to be included. Change-Id: Ie787d6841f0525e1dc290f7ca8d9cae148308e32 Reviewed-by: Friedemann Kleint --- bin/fixqt4headers.pl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'bin/fixqt4headers.pl') diff --git a/bin/fixqt4headers.pl b/bin/fixqt4headers.pl index 92162da259..bb719f7af1 100755 --- a/bin/fixqt4headers.pl +++ b/bin/fixqt4headers.pl @@ -145,13 +145,13 @@ findQtHeaders('QtConcurrent', $qtdir); findQtHeaders('QtWidgets', $qtdir); findQtHeaders('QtPrintSupport', $qtdir); -if (-d $qtdir . '/include/QtQuick1') { - findQtHeaders('QtQuick1', $qtdir); -} elsif (-d $qtdir . '/../qtdeclarative' ) { +if (-d $qtdir . '/include/QtMultiMedia') { + findQtHeaders('QtMultiMedia', $qtdir); + findQtHeaders('QtMultiMediaWidgets', $qtdir); +} elsif (-d $qtdir . '/../qtmultimedia' ) { # This is the case if QTDIR points to a source tree instead of an installed Qt - findQtHeaders('QtQuick1', $qtdir . '/../qtdeclarative'); -} else { - print "Warning - cannot find QtQuick1 headers\n"; + findQtHeaders('QtMultiMedia', $qtdir . '/../qtmultimedia'); + findQtHeaders('QtMultiMediaWidgets', $qtdir . '/../qtmultimedia'); } # Support porting from "Qt 4.99" QtDeclarative to QtQuick (QQuickItem et al) -- cgit v1.2.3