602 lines
29 KiB
Diff
602 lines
29 KiB
Diff
Index: src/extensions/js/kjsembed/tools/headers/qcanvas.h
|
|
===================================================================
|
|
--- src/extensions/js/kjsembed/tools/headers/qcanvas.h (revision 784997)
|
|
+++ src/extensions/js/kjsembed/tools/headers/qcanvas.h (revision 785267)
|
|
@@ -1,37 +1,40 @@
|
|
/**********************************************************************
|
|
-**
|
|
**
|
|
** Definition of QCanvas classes
|
|
**
|
|
** Created : 991211
|
|
**
|
|
-** Copyright (C) 1999-2002 Trolltech AS. All rights reserved.
|
|
+** Copyright (C) 1999-2008 Trolltech ASA. All rights reserved.
|
|
**
|
|
** This file is part of the canvas module of the Qt GUI Toolkit.
|
|
**
|
|
-** This file may be distributed under the terms of the Q Public License
|
|
-** as defined by Trolltech AS of Norway and appearing in the file
|
|
-** LICENSE.QPL included in the packaging of this file.
|
|
-**
|
|
-** This file may be distributed and/or modified under the terms of the
|
|
-** GNU General Public License version 2 as published by the Free Software
|
|
-** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
-**
|
|
-** Licensees holding valid Qt Enterprise Edition licenses may use this
|
|
-** file in accordance with the Qt Commercial License Agreement provided
|
|
-** with the Software.
|
|
-**
|
|
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
-**
|
|
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
|
|
-** information about Qt Commercial License Agreements.
|
|
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
|
|
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
|
|
-**
|
|
-** Contact info@trolltech.com if any conditions of this licensing are
|
|
-** not clear to you.
|
|
+** This file may be used under the terms of the GNU General
|
|
+** Public License versions 2.0 or 3.0 as published by the Free
|
|
+** Software Foundation and appearing in the files LICENSE.GPL2
|
|
+** and LICENSE.GPL3 included in the packaging of this file.
|
|
+** Alternatively you may (at your option) use any later version
|
|
+** of the GNU General Public License if such license has been
|
|
+** publicly approved by Trolltech ASA (or its successors, if any)
|
|
+** and the KDE Free Qt Foundation.
|
|
+**
|
|
+** Please review the following information to ensure GNU General
|
|
+** Public Licensing requirements will be met:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
|
|
+** If you are unsure which license is appropriate for your use, please
|
|
+** review the following information:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
|
|
+** or contact the sales department at sales@trolltech.com.
|
|
+**
|
|
+** This file may be used under the terms of the Q Public License as
|
|
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
|
|
+** included in the packaging of this file. Licensees holding valid Qt
|
|
+** Commercial licenses may use this file in accordance with the Qt
|
|
+** Commercial License Agreement provided with the Software.
|
|
+**
|
|
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
|
|
+** herein.
|
|
**
|
|
**********************************************************************/
|
|
|
|
Index: src/extensions/js/kjsembed/tools/headers/qdir.h
|
|
===================================================================
|
|
--- src/extensions/js/kjsembed/tools/headers/qdir.h (revision 784997)
|
|
+++ src/extensions/js/kjsembed/tools/headers/qdir.h (revision 785267)
|
|
@@ -1,37 +1,40 @@
|
|
/****************************************************************************
|
|
-**
|
|
**
|
|
** Definition of QDir class
|
|
**
|
|
** Created : 950427
|
|
**
|
|
-** Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
|
|
+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
|
|
**
|
|
** This file is part of the tools module of the Qt GUI Toolkit.
|
|
**
|
|
-** This file may be distributed under the terms of the Q Public License
|
|
-** as defined by Trolltech AS of Norway and appearing in the file
|
|
-** LICENSE.QPL included in the packaging of this file.
|
|
-**
|
|
-** This file may be distributed and/or modified under the terms of the
|
|
-** GNU General Public License version 2 as published by the Free Software
|
|
-** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
-**
|
|
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
|
|
-** licenses may use this file in accordance with the Qt Commercial License
|
|
-** Agreement provided with the Software.
|
|
-**
|
|
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
-**
|
|
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
|
|
-** information about Qt Commercial License Agreements.
|
|
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
|
|
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
|
|
-**
|
|
-** Contact info@trolltech.com if any conditions of this licensing are
|
|
-** not clear to you.
|
|
+** This file may be used under the terms of the GNU General
|
|
+** Public License versions 2.0 or 3.0 as published by the Free
|
|
+** Software Foundation and appearing in the files LICENSE.GPL2
|
|
+** and LICENSE.GPL3 included in the packaging of this file.
|
|
+** Alternatively you may (at your option) use any later version
|
|
+** of the GNU General Public License if such license has been
|
|
+** publicly approved by Trolltech ASA (or its successors, if any)
|
|
+** and the KDE Free Qt Foundation.
|
|
+**
|
|
+** Please review the following information to ensure GNU General
|
|
+** Public Licensing requirements will be met:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
|
|
+** If you are unsure which license is appropriate for your use, please
|
|
+** review the following information:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
|
|
+** or contact the sales department at sales@trolltech.com.
|
|
+**
|
|
+** This file may be used under the terms of the Q Public License as
|
|
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
|
|
+** included in the packaging of this file. Licensees holding valid Qt
|
|
+** Commercial licenses may use this file in accordance with the Qt
|
|
+** Commercial License Agreement provided with the Software.
|
|
+**
|
|
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
|
|
+** herein.
|
|
**
|
|
**********************************************************************/
|
|
|
|
Index: src/extensions/js/kjsembed/tools/headers/qtimer.h
|
|
===================================================================
|
|
--- src/extensions/js/kjsembed/tools/headers/qtimer.h (revision 784997)
|
|
+++ src/extensions/js/kjsembed/tools/headers/qtimer.h (revision 785267)
|
|
@@ -1,37 +1,40 @@
|
|
/****************************************************************************
|
|
-**
|
|
**
|
|
** Definition of QTimer class
|
|
**
|
|
** Created : 931111
|
|
**
|
|
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
|
|
+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
|
|
**
|
|
** This file is part of the kernel module of the Qt GUI Toolkit.
|
|
**
|
|
-** This file may be distributed under the terms of the Q Public License
|
|
-** as defined by Trolltech AS of Norway and appearing in the file
|
|
-** LICENSE.QPL included in the packaging of this file.
|
|
-**
|
|
-** This file may be distributed and/or modified under the terms of the
|
|
-** GNU General Public License version 2 as published by the Free Software
|
|
-** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
-**
|
|
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
|
|
-** licenses may use this file in accordance with the Qt Commercial License
|
|
-** Agreement provided with the Software.
|
|
-**
|
|
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
-**
|
|
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
|
|
-** information about Qt Commercial License Agreements.
|
|
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
|
|
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
|
|
-**
|
|
-** Contact info@trolltech.com if any conditions of this licensing are
|
|
-** not clear to you.
|
|
+** This file may be used under the terms of the GNU General
|
|
+** Public License versions 2.0 or 3.0 as published by the Free
|
|
+** Software Foundation and appearing in the files LICENSE.GPL2
|
|
+** and LICENSE.GPL3 included in the packaging of this file.
|
|
+** Alternatively you may (at your option) use any later version
|
|
+** of the GNU General Public License if such license has been
|
|
+** publicly approved by Trolltech ASA (or its successors, if any)
|
|
+** and the KDE Free Qt Foundation.
|
|
+**
|
|
+** Please review the following information to ensure GNU General
|
|
+** Public Licensing requirements will be met:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
|
|
+** If you are unsure which license is appropriate for your use, please
|
|
+** review the following information:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
|
|
+** or contact the sales department at sales@trolltech.com.
|
|
+**
|
|
+** This file may be used under the terms of the Q Public License as
|
|
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
|
|
+** included in the packaging of this file. Licensees holding valid Qt
|
|
+** Commercial licenses may use this file in accordance with the Qt
|
|
+** Commercial License Agreement provided with the Software.
|
|
+**
|
|
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
|
|
+** herein.
|
|
**
|
|
**********************************************************************/
|
|
|
|
Index: src/extensions/js/kjsembed/tools/headers/qpen.h
|
|
===================================================================
|
|
--- src/extensions/js/kjsembed/tools/headers/qpen.h (revision 784997)
|
|
+++ src/extensions/js/kjsembed/tools/headers/qpen.h (revision 785267)
|
|
@@ -1,37 +1,40 @@
|
|
/****************************************************************************
|
|
-**
|
|
**
|
|
** Definition of QPen class
|
|
**
|
|
** Created : 940112
|
|
**
|
|
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
|
|
+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
|
|
**
|
|
** This file is part of the kernel module of the Qt GUI Toolkit.
|
|
**
|
|
-** This file may be distributed under the terms of the Q Public License
|
|
-** as defined by Trolltech AS of Norway and appearing in the file
|
|
-** LICENSE.QPL included in the packaging of this file.
|
|
-**
|
|
-** This file may be distributed and/or modified under the terms of the
|
|
-** GNU General Public License version 2 as published by the Free Software
|
|
-** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
-**
|
|
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
|
|
-** licenses may use this file in accordance with the Qt Commercial License
|
|
-** Agreement provided with the Software.
|
|
-**
|
|
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
-**
|
|
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
|
|
-** information about Qt Commercial License Agreements.
|
|
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
|
|
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
|
|
-**
|
|
-** Contact info@trolltech.com if any conditions of this licensing are
|
|
-** not clear to you.
|
|
+** This file may be used under the terms of the GNU General
|
|
+** Public License versions 2.0 or 3.0 as published by the Free
|
|
+** Software Foundation and appearing in the files LICENSE.GPL2
|
|
+** and LICENSE.GPL3 included in the packaging of this file.
|
|
+** Alternatively you may (at your option) use any later version
|
|
+** of the GNU General Public License if such license has been
|
|
+** publicly approved by Trolltech ASA (or its successors, if any)
|
|
+** and the KDE Free Qt Foundation.
|
|
+**
|
|
+** Please review the following information to ensure GNU General
|
|
+** Public Licensing requirements will be met:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
|
|
+** If you are unsure which license is appropriate for your use, please
|
|
+** review the following information:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
|
|
+** or contact the sales department at sales@trolltech.com.
|
|
+**
|
|
+** This file may be used under the terms of the Q Public License as
|
|
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
|
|
+** included in the packaging of this file. Licensees holding valid Qt
|
|
+** Commercial licenses may use this file in accordance with the Qt
|
|
+** Commercial License Agreement provided with the Software.
|
|
+**
|
|
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
|
|
+** herein.
|
|
**
|
|
**********************************************************************/
|
|
|
|
Index: src/extensions/js/kjsembed/tools/headers/qbrush.h
|
|
===================================================================
|
|
--- src/extensions/js/kjsembed/tools/headers/qbrush.h (revision 784997)
|
|
+++ src/extensions/js/kjsembed/tools/headers/qbrush.h (revision 785267)
|
|
@@ -1,37 +1,40 @@
|
|
/****************************************************************************
|
|
-**
|
|
**
|
|
** Definition of QBrush class
|
|
**
|
|
** Created : 940112
|
|
**
|
|
-** Copyright (C) 1992-2000 Trolltech AS. All rights reserved.
|
|
+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
|
|
**
|
|
** This file is part of the kernel module of the Qt GUI Toolkit.
|
|
**
|
|
-** This file may be distributed under the terms of the Q Public License
|
|
-** as defined by Trolltech AS of Norway and appearing in the file
|
|
-** LICENSE.QPL included in the packaging of this file.
|
|
-**
|
|
-** This file may be distributed and/or modified under the terms of the
|
|
-** GNU General Public License version 2 as published by the Free Software
|
|
-** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
-**
|
|
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
|
|
-** licenses may use this file in accordance with the Qt Commercial License
|
|
-** Agreement provided with the Software.
|
|
-**
|
|
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
-**
|
|
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
|
|
-** information about Qt Commercial License Agreements.
|
|
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
|
|
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
|
|
-**
|
|
-** Contact info@trolltech.com if any conditions of this licensing are
|
|
-** not clear to you.
|
|
+** This file may be used under the terms of the GNU General
|
|
+** Public License versions 2.0 or 3.0 as published by the Free
|
|
+** Software Foundation and appearing in the files LICENSE.GPL2
|
|
+** and LICENSE.GPL3 included in the packaging of this file.
|
|
+** Alternatively you may (at your option) use any later version
|
|
+** of the GNU General Public License if such license has been
|
|
+** publicly approved by Trolltech ASA (or its successors, if any)
|
|
+** and the KDE Free Qt Foundation.
|
|
+**
|
|
+** Please review the following information to ensure GNU General
|
|
+** Public Licensing requirements will be met:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
|
|
+** If you are unsure which license is appropriate for your use, please
|
|
+** review the following information:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
|
|
+** or contact the sales department at sales@trolltech.com.
|
|
+**
|
|
+** This file may be used under the terms of the Q Public License as
|
|
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
|
|
+** included in the packaging of this file. Licensees holding valid Qt
|
|
+** Commercial licenses may use this file in accordance with the Qt
|
|
+** Commercial License Agreement provided with the Software.
|
|
+**
|
|
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
|
|
+** herein.
|
|
**
|
|
**********************************************************************/
|
|
|
|
Index: src/libkst/kstwaitcondition_unix.cpp
|
|
===================================================================
|
|
--- src/libkst/kstwaitcondition_unix.cpp (revision 784997)
|
|
+++ src/libkst/kstwaitcondition_unix.cpp (revision 785267)
|
|
@@ -5,33 +5,37 @@
|
|
**
|
|
** Created : 20010725
|
|
**
|
|
-** Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
|
|
+** Copyright (C) 1992-2008 Trolltech ASA. All rights reserved.
|
|
**
|
|
** This file is part of the tools module of the Qt GUI Toolkit.
|
|
**
|
|
-** This file may be distributed under the terms of the Q Public License
|
|
-** as defined by Trolltech AS of Norway and appearing in the file
|
|
-** LICENSE.QPL included in the packaging of this file.
|
|
-**
|
|
-** This file may be distributed and/or modified under the terms of the
|
|
-** GNU General Public License version 2 as published by the Free Software
|
|
-** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
-**
|
|
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
|
|
-** licenses for Unix/X11 or for Qt/Embedded may use this file in accordance
|
|
-** with the Qt Commercial License Agreement provided with the Software.
|
|
-**
|
|
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
-**
|
|
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
|
|
-** information about Qt Commercial License Agreements.
|
|
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
|
|
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
|
|
-**
|
|
-** Contact info@trolltech.com if any conditions of this licensing are
|
|
-** not clear to you.
|
|
+** This file may be used under the terms of the GNU General
|
|
+** Public License versions 2.0 or 3.0 as published by the Free
|
|
+** Software Foundation and appearing in the files LICENSE.GPL2
|
|
+** and LICENSE.GPL3 included in the packaging of this file.
|
|
+** Alternatively you may (at your option) use any later version
|
|
+** of the GNU General Public License if such license has been
|
|
+** publicly approved by Trolltech ASA (or its successors, if any)
|
|
+** and the KDE Free Qt Foundation.
|
|
+**
|
|
+** Please review the following information to ensure GNU General
|
|
+** Public Licensing requirements will be met:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
|
|
+** If you are unsure which license is appropriate for your use, please
|
|
+** review the following information:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
|
|
+** or contact the sales department at sales@trolltech.com.
|
|
+**
|
|
+** This file may be used under the terms of the Q Public License as
|
|
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
|
|
+** included in the packaging of this file. Licensees holding valid Qt
|
|
+** Commercial licenses may use this file in accordance with the Qt
|
|
+** Commercial License Agreement provided with the Software.
|
|
+**
|
|
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
|
|
+** herein.
|
|
**
|
|
**********************************************************************/
|
|
|
|
Index: src/libkst/kstwaitcondition.h
|
|
===================================================================
|
|
--- src/libkst/kstwaitcondition.h (revision 784997)
|
|
+++ src/libkst/kstwaitcondition.h (revision 785267)
|
|
@@ -5,33 +5,35 @@
|
|
**
|
|
** Created : 931107
|
|
**
|
|
-** Copyright (C) 1992-2002 Trolltech AS. All rights reserved.
|
|
-**
|
|
** This file is part of the tools module of the Qt GUI Toolkit.
|
|
**
|
|
-** This file may be distributed under the terms of the Q Public License
|
|
-** as defined by Trolltech AS of Norway and appearing in the file
|
|
-** LICENSE.QPL included in the packaging of this file.
|
|
-**
|
|
-** This file may be distributed and/or modified under the terms of the
|
|
-** GNU General Public License version 2 as published by the Free Software
|
|
-** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
-**
|
|
-** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
|
|
-** licenses may use this file in accordance with the Qt Commercial License
|
|
-** Agreement provided with the Software.
|
|
-**
|
|
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
-**
|
|
-** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
|
|
-** information about Qt Commercial License Agreements.
|
|
-** See http://www.trolltech.com/qpl/ for QPL licensing information.
|
|
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
|
|
-**
|
|
-** Contact info@trolltech.com if any conditions of this licensing are
|
|
-** not clear to you.
|
|
+** This file may be used under the terms of the GNU General
|
|
+** Public License versions 2.0 or 3.0 as published by the Free
|
|
+** Software Foundation and appearing in the files LICENSE.GPL2
|
|
+** and LICENSE.GPL3 included in the packaging of this file.
|
|
+** Alternatively you may (at your option) use any later version
|
|
+** of the GNU General Public License if such license has been
|
|
+** publicly approved by Trolltech ASA (or its successors, if any)
|
|
+** and the KDE Free Qt Foundation.
|
|
+**
|
|
+** Please review the following information to ensure GNU General
|
|
+** Public Licensing requirements will be met:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
|
|
+** If you are unsure which license is appropriate for your use, please
|
|
+** review the following information:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
|
|
+** or contact the sales department at sales@trolltech.com.
|
|
+**
|
|
+** This file may be used under the terms of the Q Public License as
|
|
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
|
|
+** included in the packaging of this file. Licensees holding valid Qt
|
|
+** Commercial licenses may use this file in accordance with the Qt
|
|
+** Commercial License Agreement provided with the Software.
|
|
+**
|
|
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
|
|
+** herein.
|
|
**
|
|
**********************************************************************/
|
|
|
|
Index: src/extdate/kstextdatetime.cpp
|
|
===================================================================
|
|
--- src/extdate/kstextdatetime.cpp (revision 784997)
|
|
+++ src/extdate/kstextdatetime.cpp (revision 785267)
|
|
@@ -6,7 +6,7 @@
|
|
** This file may be distributed and/or modified under the terms of the
|
|
** GNU General Public License version 2 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
+** packaging of this file, or (at your option) any later version.
|
|
**
|
|
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
Index: src/extdate/kstextdatetime.h
|
|
===================================================================
|
|
--- src/extdate/kstextdatetime.h (revision 784997)
|
|
+++ src/extdate/kstextdatetime.h (revision 785267)
|
|
@@ -6,7 +6,7 @@
|
|
** This file may be distributed and/or modified under the terms of the
|
|
** GNU General Public License version 2 as published by the Free Software
|
|
** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
+** packaging of this file, or (at your option) any later version.
|
|
**
|
|
** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
Index: src/extdate/kstextdatetimeedit.cpp
|
|
===================================================================
|
|
--- src/extdate/kstextdatetimeedit.cpp (revision 784997)
|
|
+++ src/extdate/kstextdatetimeedit.cpp (revision 785267)
|
|
@@ -8,15 +8,35 @@
|
|
** Original qatetimeedit.cpp Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
|
|
**>> ExtDate modifications (C) 2004 Jason Harris <jharris@30doradus.org>
|
|
**
|
|
-** This file may be distributed and/or modified under the terms of the
|
|
-** GNU General Public License version 2 as published by the Free Software
|
|
-** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
+** This file is part of the tools module of the Qt GUI Toolkit.
|
|
**
|
|
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
+** This file may be used under the terms of the GNU General
|
|
+** Public License versions 2.0 or 3.0 as published by the Free
|
|
+** Software Foundation and appearing in the files LICENSE.GPL2
|
|
+** and LICENSE.GPL3 included in the packaging of this file.
|
|
+** Alternatively you may (at your option) use any later version
|
|
+** of the GNU General Public License if such license has been
|
|
+** publicly approved by Trolltech ASA (or its successors, if any)
|
|
+** and the KDE Free Qt Foundation.
|
|
**
|
|
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
|
|
+** Please review the following information to ensure GNU General
|
|
+** Public Licensing requirements will be met:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
|
|
+** If you are unsure which license is appropriate for your use, please
|
|
+** review the following information:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
|
|
+** or contact the sales department at sales@trolltech.com.
|
|
+**
|
|
+** This file may be used under the terms of the Q Public License as
|
|
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
|
|
+** included in the packaging of this file. Licensees holding valid Qt
|
|
+** Commercial licenses may use this file in accordance with the Qt
|
|
+** Commercial License Agreement provided with the Software.
|
|
+**
|
|
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
|
|
+** herein.
|
|
**
|
|
**********************************************************************/
|
|
|
|
Index: src/extdate/kstextdatetimeedit.h
|
|
===================================================================
|
|
--- src/extdate/kstextdatetimeedit.h (revision 784997)
|
|
+++ src/extdate/kstextdatetimeedit.h (revision 785267)
|
|
@@ -10,15 +10,35 @@
|
|
** >> modifications to introduce ExtDate (C) 2004 Jason Harris <jharris@30doradus.org>
|
|
** >> ExtDate modifications are licensed under the GPL: http://www.gnu.org/licenses/gpl.html
|
|
**
|
|
-** This file may be distributed and/or modified under the terms of the
|
|
-** GNU General Public License version 2 as published by the Free Software
|
|
-** Foundation and appearing in the file LICENSE.GPL included in the
|
|
-** packaging of this file.
|
|
+** This file is part of the tools module of the Qt GUI Toolkit.
|
|
**
|
|
-** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
|
|
-** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
|
|
+** This file may be used under the terms of the GNU General
|
|
+** Public License versions 2.0 or 3.0 as published by the Free
|
|
+** Software Foundation and appearing in the files LICENSE.GPL2
|
|
+** and LICENSE.GPL3 included in the packaging of this file.
|
|
+** Alternatively you may (at your option) use any later version
|
|
+** of the GNU General Public License if such license has been
|
|
+** publicly approved by Trolltech ASA (or its successors, if any)
|
|
+** and the KDE Free Qt Foundation.
|
|
**
|
|
-** See http://www.trolltech.com/gpl/ for GPL licensing information.
|
|
+** Please review the following information to ensure GNU General
|
|
+** Public Licensing requirements will be met:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/opensource/.
|
|
+** If you are unsure which license is appropriate for your use, please
|
|
+** review the following information:
|
|
+** http://trolltech.com/products/qt/licenses/licensing/licensingoverview
|
|
+** or contact the sales department at sales@trolltech.com.
|
|
+**
|
|
+** This file may be used under the terms of the Q Public License as
|
|
+** defined by Trolltech ASA and appearing in the file LICENSE.QPL
|
|
+** included in the packaging of this file. Licensees holding valid Qt
|
|
+** Commercial licenses may use this file in accordance with the Qt
|
|
+** Commercial License Agreement provided with the Software.
|
|
+**
|
|
+** This file is provided "AS IS" with NO WARRANTY OF ANY KIND,
|
|
+** INCLUDING THE WARRANTIES OF DESIGN, MERCHANTABILITY AND FITNESS FOR
|
|
+** A PARTICULAR PURPOSE. Trolltech reserves all rights not granted
|
|
+** herein.
|
|
**
|
|
**********************************************************************/
|
|
|