diff options
| author | Sergio Ahumada <sergio.ahumada@digia.com> | 2012-11-26 12:47:10 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-26 17:33:37 +0100 |
| commit | cd765bbae07310b29c8d0f0275fdc3c7f0696472 (patch) | |
| tree | 6e71072e42b08f6de6d5640b95edc8f243ef6e9a /qmake | |
| parent | 7c3fa5a292b36a058fec2d241f5eda2c350a29e9 (diff) | |
qmake: Change copyright information from Nokia to Digia
Task-number: QTBUG-28156
Change-Id: If54615a465504b4124891fb393185eb324372874
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/generators/projectgenerator.cpp | 2 | ||||
| -rw-r--r-- | qmake/generators/projectgenerator.h | 2 | ||||
| -rw-r--r-- | qmake/option.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/qmake/generators/projectgenerator.cpp b/qmake/generators/projectgenerator.cpp index 2d15a5ea3e..46cfe72258 100644 --- a/qmake/generators/projectgenerator.cpp +++ b/qmake/generators/projectgenerator.cpp @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** ** 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 fda6c90d5c..e9c024d21b 100644 --- a/qmake/generators/projectgenerator.h +++ b/qmake/generators/projectgenerator.h @@ -1,6 +1,6 @@ /**************************************************************************** ** -** Copyright (C) 2012 Nokia Corporation and/or its subsidiary(-ies). +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). ** Contact: http://www.qt-project.org/ ** ** This file is part of the qmake application of the Qt Toolkit. diff --git a/qmake/option.cpp b/qmake/option.cpp index 91c154ab6c..00c604f4c3 100644 --- a/qmake/option.cpp +++ b/qmake/option.cpp @@ -225,7 +225,7 @@ Option::parseCommandLine(QStringList &args) QMAKE_VERSION_STR, 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 (arg == "-h" || arg == "-help" || arg == "--help") { |