Skip to content

Commit

Permalink
Merge license header changes from 4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
Volker Hilsheimer committed Jun 16, 2009
2 parents 237a3e6 + d4ea395 commit e73e36a
Show file tree
Hide file tree
Showing 7,169 changed files with 144,839 additions and 15,545 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
2 changes: 2 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,7 @@ tests/auto/qresourceengine/runtime_resource.rcc
tools/qdoc3/qdoc3*
tools/qtestlib/updater/updater*
tools/activeqt/testcon/testcon.tlb
translations/*.qm
qrc_*.cpp

# xemacs temporary files
Expand Down Expand Up @@ -169,6 +170,7 @@ doc/qch
doc-build
.rcc
.pch
qtc-debugging-helper
src/corelib/lib
src/network/lib
src/xml/lib/
2 changes: 1 addition & 1 deletion LICENSE.GPL3
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU GENERAL PUBLIC LICENSE

The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
Contact: Qt Software Information ([email protected])
Contact: Nokia Corporation ([email protected])

You may use, distribute and copy the Qt GUI Toolkit under the terms of
GNU General Public License version 3, which is displayed below.
Expand Down
2 changes: 1 addition & 1 deletion LICENSE.LGPL
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
GNU LESSER GENERAL PUBLIC LICENSE

The Qt GUI Toolkit is Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
Contact: Qt Software Information ([email protected])
Contact: Nokia Corporation ([email protected])

You may use, distribute and copy the Qt GUI Toolkit under the terms of
GNU Lesser General Public License version 2.1, which is displayed below.
Expand Down
2 changes: 1 addition & 1 deletion bin/syncqt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# Synchronizes Qt header files - internal Trolltech tool.
#
# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
# Contact: Qt Software Information ([email protected])
# Contact: Nokia Corporation ([email protected])
#
######################################################################

Expand Down
30 changes: 17 additions & 13 deletions configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# Configures to build the Qt library
#
# Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
# Contact: Qt Software Information ([email protected])
# Contact: Nokia Corporation ([email protected])
#
# This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
# WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
Expand Down Expand Up @@ -311,7 +311,7 @@ elif [ $COMMERCIAL_USER = "yes" ]; then
echo
echo "You are using an old license file."
echo
echo "Please install the license file supplied by Qt Software,"
echo "Please install the license file supplied by Nokia,"
echo "or install the Qt Open Source Edition if you intend to"
echo "develop free software."
exit 1
Expand Down Expand Up @@ -7071,9 +7071,9 @@ BEGIN {
FNR == 1 {
if ( input_file ) {
if ( ! target_file )
target_file = third
print input_file >target_file
if ( ! target_file )
target_file = third
print input_file >target_file
}
matched_target = 0
Expand All @@ -7084,32 +7084,35 @@ FNR == 1 {
/^(TARGET.*=)/ {
if ( \$3 == "moc" || \$3 ~ /^Qt/ ) {
target_file = first
target_file = first
matched_target = 1
} else if ( \$3 == "lrelease" || \$3 == "qm_phony_target" ) {
target_file = second
matched_target = 1
}
}
matched_target == 0 && /^(TEMPLATE.*=)/ {
if ( \$3 == "subdirs" )
target_file = second
target_file = second
else if ( \$3 == "lib" )
template_lib = 1
template_lib = 1
else
target_file = third
target_file = third
}
matched_target == 0 && template_lib == 1 && /^(CONFIG.*=)/ {
if ( \$0 ~ /plugin/ )
target_file = third
else
target_file = second
target_file = second
}
END {
if ( input_file ) {
if ( ! target_file )
target_file = third
print input_file >>target_file
if ( ! target_file )
target_file = third
print input_file >>target_file
}
}
Expand Down Expand Up @@ -7170,6 +7173,7 @@ for part in $CFG_BUILD_PARTS; do
case "$part" in
tools) PART_ROOTS="$PART_ROOTS tools" ;;
libs) PART_ROOTS="$PART_ROOTS src" ;;
translations) PART_ROOTS="$PART_ROOTS tools/linguist/lrelease translations" ;;
examples) PART_ROOTS="$PART_ROOTS examples demos" ;;
*) ;;
esac
Expand Down
Binary file modified configure.exe
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions demos/affine/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
6 changes: 3 additions & 3 deletions demos/affine/xform.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down Expand Up @@ -895,7 +895,7 @@ XFormWidget::XFormWidget(QWidget *parent)
// defaults
view->reset();
vectorType->setChecked(true);
textEditor->setText("Qt Software");
textEditor->setText("Qt Affine Transformation Demo");
textEditor->setEnabled(false);

animateButton->animateClick();
Expand Down
4 changes: 2 additions & 2 deletions demos/affine/xform.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/arthurplugin/plugin.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/books/bookdelegate.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/books/bookdelegate.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/books/bookwindow.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/books/bookwindow.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/books/initdb.h
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/books/main.cpp
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/boxes/basic.fsh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/boxes/basic.vsh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/boxes/dotted.fsh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
4 changes: 2 additions & 2 deletions demos/boxes/fresnel.fsh
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/****************************************************************************
**
** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
** Contact: Qt Software Information ([email protected])
** Contact: Nokia Corporation ([email protected])
**
** This file is part of the demonstration applications of the Qt Toolkit.
**
Expand Down Expand Up @@ -34,7 +34,7 @@
** met: http://www.gnu.org/copyleft/gpl.html.
**
** If you are unsure which license is appropriate for your use, please
** contact the sales department at qt-sales@nokia.com.
** contact the sales department at http://www.qtsoftware.com/contact.
** $QT_END_LICENSE$
**
****************************************************************************/
Expand Down
Loading

0 comments on commit e73e36a

Please sign in to comment.