diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-23 22:12:54 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-01-23 22:12:54 +0100 |
| commit | 7df08a8b63c8fc861a5e927eabf2405e1a2a01e1 (patch) | |
| tree | 495ff2934465b02b01fc2ff694687344c909bf62 /bin | |
| parent | 06e4b1cff4c469d2fc3afbfe7a6b1954fedc90ff (diff) | |
| parent | c608ec825410a9287f544a2ae3ce8154424e767d (diff) | |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/findtr | 2 | ||||
| -rwxr-xr-x | bin/fixqt4headers.pl | 12 | ||||
| -rwxr-xr-x | bin/syncqt | 2 | ||||
| -rwxr-xr-x | bin/syncqt.bat | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/bin/findtr b/bin/findtr index b3dd784101..975485f94d 100755 --- a/bin/findtr +++ b/bin/findtr @@ -2,7 +2,7 @@ # vi:wrap: ############################################################################# ## -## 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 translations of the Qt Toolkit. 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) diff --git a/bin/syncqt b/bin/syncqt index ac81b0a8e2..c6e22aa63f 100755 --- a/bin/syncqt +++ b/bin/syncqt @@ -1,7 +1,7 @@ #!/usr/bin/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 build configuration tools of the Qt Toolkit. diff --git a/bin/syncqt.bat b/bin/syncqt.bat index 88d4ffd6c2..99ada5baa7 100755 --- a/bin/syncqt.bat +++ b/bin/syncqt.bat @@ -1,6 +1,6 @@ ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: :: -:: 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 tools applications of the Qt Toolkit. |