fixqt4headers: Support renaming from QtDeclarative to QtQuick
QtDeclarative was recently split into two modules, with the QtQuick(2)-specific API moved to QtQuick. While strictly speaking the old API wasn't "Qt 4", it's more convenient to modify this script than to create a separate one. For example, "QtDeclarative/qquickitem.h" will now be changed to "QtQuick/qquickitem.h". Change-Id: I50b32d60cfd21e3c49ee4222fbd6116f80eac25b Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
This commit is contained in:
parent
b989444f35
commit
7d05425e02
@ -152,6 +152,14 @@ if (-d $qtdir . '/include/QtQuick1') {
|
||||
print "Warning - cannot find QtQuick1 headers\n";
|
||||
}
|
||||
|
||||
# Support porting from "Qt 4.99" QtDeclarative to QtQuick (QQuickItem et al)
|
||||
if (-d $qtdir . '/include/QtQuick') {
|
||||
findQtHeaders('QtQuick', $qtdir);
|
||||
} elsif (-d $qtdir . '/../qtdeclarative' ) {
|
||||
# This is the case if QTDIR points to a source tree instead of an installed Qt
|
||||
findQtHeaders('QtQuick', $qtdir . '/../qtdeclarative');
|
||||
}
|
||||
|
||||
# special case
|
||||
$headerSubst{'QtGui'} = 'QtWidgets/QtWidgets';
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user