diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2011-12-05 13:08:08 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-07 09:33:47 +0100 |
| commit | 7d05425e02692eecde40fc4b4950bc55784db67f (patch) | |
| tree | eb893b8400b9c8c60986f0e559dff5391f34b223 /bin | |
| parent | b989444f35c19049510fc39eba19e9cf0f4dd107 (diff) | |
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>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/fixqt4headers.pl | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/bin/fixqt4headers.pl b/bin/fixqt4headers.pl index 1905a6b21f..966681fad5 100755 --- a/bin/fixqt4headers.pl +++ b/bin/fixqt4headers.pl @@ -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'; |