diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-22 18:40:13 +0100 |
| commit | c608ec825410a9287f544a2ae3ce8154424e767d (patch) | |
| tree | 39ee3d73d1e970bf808ecb9f1af8affc124199e1 /bin/fixqt4headers.pl | |
| parent | f5c6a5d06ba7b303f2999dd7a103c29282abfaa6 (diff) | |
| parent | 15a32435561a668e69764d12edfa2b5c564c6505 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qsavefile_p.h
src/corelib/tools/qregularexpression.cpp
src/gui/util/qvalidator.cpp
src/gui/util/qvalidator.h
Change-Id: I58fdf0358bd86e2fad5d9ad0556f3d3f1f535825
Diffstat (limited to 'bin/fixqt4headers.pl')
| -rwxr-xr-x | bin/fixqt4headers.pl | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/bin/fixqt4headers.pl b/bin/fixqt4headers.pl index bb719f7af1..653c1ae8c1 100755 --- a/bin/fixqt4headers.pl +++ b/bin/fixqt4headers.pl @@ -1,7 +1,7 @@ #!/usr/bin/env perl ############################################################################# ## -## Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). ## Contact: http://www.qt-project.org/legal ## ## This file is part of the porting tools of the Qt Toolkit. @@ -145,13 +145,13 @@ findQtHeaders('QtConcurrent', $qtdir); findQtHeaders('QtWidgets', $qtdir); findQtHeaders('QtPrintSupport', $qtdir); -if (-d $qtdir . '/include/QtMultiMedia') { - findQtHeaders('QtMultiMedia', $qtdir); - findQtHeaders('QtMultiMediaWidgets', $qtdir); +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('QtMultiMedia', $qtdir . '/../qtmultimedia'); - findQtHeaders('QtMultiMediaWidgets', $qtdir . '/../qtmultimedia'); + findQtHeaders('QtMultimedia', $qtdir . '/../qtmultimedia'); + findQtHeaders('QtMultimediaWidgets', $qtdir . '/../qtmultimedia'); } # Support porting from "Qt 4.99" QtDeclarative to QtQuick (QQuickItem et al) |