AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixqt4headers: Remove QtQuick1 and add QtMultimedia

Browse Source 
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 <Friedemann.Kleint@digia.com>
This commit is contained in:
Lars Knoll 2012-11-28 11:04:22 +01:00 committed by The Qt Project
parent 50a22d8418
commit 003860b5a7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bin/fixqt4headers.pl
View File

@ -145,13 +145,13 @@ findQtHeaders('QtConcurrent', $qtdir);
findQtHeaders('QtWidgets', $qtdir); findQtHeaders('QtWidgets', $qtdir);
findQtHeaders('QtPrintSupport', $qtdir); findQtHeaders('QtPrintSupport', $qtdir);
if (-d $qtdir . '/include/QtQuick1') { if (-d $qtdir . '/include/QtMultiMedia') {
findQtHeaders('QtQuick1', $qtdir); findQtHeaders('QtMultiMedia', $qtdir);
} elsif (-d $qtdir . '/../qtdeclarative' ) { findQtHeaders('QtMultiMediaWidgets', $qtdir);
} elsif (-d $qtdir . '/../qtmultimedia' ) {
# This is the case if QTDIR points to a source tree instead of an installed Qt # This is the case if QTDIR points to a source tree instead of an installed Qt
findQtHeaders('QtQuick1', $qtdir . '/../qtdeclarative'); findQtHeaders('QtMultiMedia', $qtdir . '/../qtmultimedia');
} else { findQtHeaders('QtMultiMediaWidgets', $qtdir . '/../qtmultimedia');
print "Warning - cannot find QtQuick1 headers\n";
} }
# Support porting from "Qt 4.99" QtDeclarative to QtQuick (QQuickItem et al) # Support porting from "Qt 4.99" QtDeclarative to QtQuick (QQuickItem et al)