From 48e0c4df2337e94bb845f5312dd7d88f75d9716c Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Wed, 2 Jan 2013 12:13:29 +0100 Subject: Update copyright year in Digia's license headers Change-Id: Ic804938fc352291d011800d21e549c10acac66fb Reviewed-by: Lars Knoll --- bin/findtr | 2 +- bin/fixqt4headers.pl | 2 +- bin/syncqt | 2 +- bin/syncqt.bat | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'bin') 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..708b111e97 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. 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. -- cgit v1.2.3 From f9f83e1ef7b7a2c9b5c9e6b2c74ea6b79eb5d922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lu=C3=ADs=20Pereira?= Date: Fri, 18 Jan 2013 04:51:25 -0800 Subject: fixqt4headers: Fix typo in QtMultimedia headers module name Commit 003860b5 introduced QtMultimedia, but with a typo. It broke the script. Change-Id: Ie3fd536d90f52419818f36ba1b28d437b965dcdc Reviewed-by: Oswald Buddenhagen --- bin/fixqt4headers.pl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'bin') diff --git a/bin/fixqt4headers.pl b/bin/fixqt4headers.pl index 708b111e97..653c1ae8c1 100755 --- a/bin/fixqt4headers.pl +++ b/bin/fixqt4headers.pl @@ -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) -- cgit v1.2.3