[Kde-cygwin-cvs] CVS: qt-3/src/tools qcomplextext_p.h, 1.1.2.2, 1.1.2.3 qdir_win.cpp, 1.1.2.9.2.4, 1.1.2.9.2.5 qfile_win.cpp, 1.1.2.8.2.3, 1.1.2.8.2.4 qfileinfo_win.cpp, 1.1.2.7.2.4, 1.1.2.7.2.5 qlibrary_win.cpp, 1.1.2.4.2.3, 1.1.2.4.2.4 qlocale.cpp, 1.1.1.2, 1.1.1.3 qlocale.h, 1.1.1.2, 1.1.1.3 qmutex_win.cpp, 1.1.2.5.2.2, 1.1.2.5.2.3 qsemaphore_win.cpp, 1.1.2.3.2.2, 1.1.2.3.2.3 qsettings_win.cpp, 1.1.2.4.2.5, 1.1.2.4.2.6 qthreadstorage_win.cpp, 1.1.2.3.2.3, 1.1.2.3.2.4 qwaitcondition_win.cpp, 1.1.2.5.2.3, 1.1.2.5.2.4

[Holger Schroeder]

Hi,

i just saw this patch on the cvs mailing list:


On Friday 24 September 2004 13:57, Christopher January wrote:
> Update of /cvsroot/kde-cygwin/qt-3/src/tools
> In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14823/tools
>
> Modified Files:
>       Tag: QT_WIN32_3_3_BRANCH
>  qcomplextext_p.h qdir_win.cpp qfile_win.cpp qfileinfo_win.cpp
>  qlibrary_win.cpp qlocale.cpp qlocale.h qmutex_win.cpp
>  qsemaphore_win.cpp qsettings_win.cpp qthreadstorage_win.cpp
>  qwaitcondition_win.cpp
> Log Message:
> Make licensing consistent
>
> Index: qcomplextext_p.h
> ===================================================================
> RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/Attic/qcomplextext_p.h,v
> retrieving revision 1.1.2.2
> retrieving revision 1.1.2.3
> diff -u -r1.1.2.2 -r1.1.2.3
> --- qcomplextext_p.h 23 Sep 2004 12:58:38 -0000 1.1.2.2
> +++ qcomplextext_p.h 24 Sep 2004 11:57:03 -0000 1.1.2.3
> @@ -3,7 +3,9 @@
>  **
>  ** Internal header file.
>  **
> -** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
> +** Created: 20040828
> +**
> +** Copyright (C) 2004 Ralf Habacker
>  **
>  ** This file is part of the kernel module of the Qt GUI Toolkit.
>  **
> @@ -16,19 +18,13 @@
>  ** 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 at trolltech.com
> for -**   information about Qt Commercial License Agreements.

i think we should not remove this statement about how people can get a 
commercial version of Qt, but perhaps it is just me...


>  ** See http://www.trolltech.com/qpl/ for QPL licensing information.
>  ** See http://www.trolltech.com/gpl/ for GPL licensing information.
>  **
> -** Contact info at trolltech.com if any conditions of this licensing are
> +** Contact kde-cygwin at kde.org if any conditions of this licensing are
>  ** not clear to you.
>  **
>  **********************************************************************/
>

<snip>