diff options
| author | jutaipal <juhani.taipale@digia.com> | 2012-12-05 02:50:35 -0800 |
|---|---|---|
| committer | jutaipal <juhani.taipale@digia.com> | 2012-12-05 02:50:35 -0800 |
| commit | 76afdfd6765876e0620cbfca1b9ca44d911bdd9c (patch) | |
| tree | a8c4645de9021e858c934e7eee0c7b932875650c /qmake | |
| parent | d4d15139c53e7e78be3db32d24ebbfa46db3a759 (diff) | |
| download | qt4-tools-76afdfd6765876e0620cbfca1b9ca44d911bdd9c.tar.gz | |
Nokia corp to Digia Plc and contact info changes
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/projectgenerator.cpp | 4 | ||||
| -rw-r--r-- | qmake/generators/projectgenerator.h | 4 | ||||
| -rw-r--r-- | qmake/option.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 236d3289ce..5e1e0ce46f 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -1,8 +1,8 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Digia Plc and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Digia Plc (http://www.qt-project.org/legal) ** ** This file is part of the qmake application of the Qt Toolkit. ** diff --git a/qmake/generators/projectgenerator.h b/qmake/generators/projectgenerator.h index 80bb3ec156..b652016959 100644 --- a/qmake/generators/projectgenerator.h +++ b/qmake/generators/projectgenerator.h @@ -1,8 +1,8 @@ /**************************************************************************** ** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2011 Digia Plc and/or its subsidiary(-ies). ** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) +** Contact: Digia Plc (http://www.qt-project.org/legal) ** ** This file is part of the qmake application of the Qt Toolkit. ** diff --git a/qmake/option.cpp b/qmake/option.cpp index 27f20c9610..022a2f1f6d 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -270,7 +270,7 @@ Option::parseCommandLine(int argc, char **argv, int skip) qmake_version(), QT_VERSION_STR, QLibraryInfo::location(QLibraryInfo::LibrariesPath).toLatin1().constData()); #ifdef QMAKE_OPENSOURCE_VERSION - fprintf(stdout, "QMake is Open Source software from Nokia Corporation and/or its subsidiary(-ies).\n"); + fprintf(stdout, "QMake is Open Source software from Digia Plc and/or its subsidiary(-ies).\n"); #endif return Option::QMAKE_CMDLINE_BAIL; } else if(opt == "h" || opt == "help") { |