kde-cygwin--cvs Mailing List for KDE on Cygwin (Page 6)
Status: Inactive
Brought to you by:
habacker
Menu
▾
▴
kde-cygwin--cvs — List for CVS update notification
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(88) |
Jul
(27) |
Aug
(3) |
Sep
(1) |
Oct
(3) |
Nov
(20) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(23) |
Feb
(25) |
Mar
(9) |
Apr
(88) |
May
(137) |
Jun
(244) |
Jul
(52) |
Aug
(17) |
Sep
(1) |
Oct
(12) |
Nov
(124) |
Dec
(42) |
| 2003 |
Jan
(112) |
Feb
(53) |
Mar
(24) |
Apr
(6) |
May
|
Jun
(63) |
Jul
(64) |
Aug
(151) |
Sep
(5) |
Oct
(87) |
Nov
(58) |
Dec
(13) |
| 2004 |
Jan
(76) |
Feb
(22) |
Mar
(30) |
Apr
(41) |
May
(4) |
Jun
(60) |
Jul
(39) |
Aug
(217) |
Sep
(165) |
Oct
(90) |
Nov
(72) |
Dec
(60) |
| 2005 |
Jan
(153) |
Feb
(110) |
Mar
(76) |
Apr
(237) |
May
(60) |
Jun
(20) |
Jul
(39) |
Aug
(8) |
Sep
(136) |
Oct
(39) |
Nov
|
Dec
|
| 2006 |
Jan
(16) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
|
Mar
(1) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
| 2012 |
Jan
|
Feb
(1) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2017 |
Jan
|
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:21
|
Update of /cvsroot/kde-cygwin/qt-3/examples/network/infoprotocol/infoserver In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/examples/network/infoprotocol/infoserver Modified Files: infodata.cpp infodata.h main.cpp server.cpp server.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: infodata.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/examples/network/infoprotocol/infoserver/infodata.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- infodata.cpp 22 Sep 2005 12:59:52 -0000 1.1.1.4 +++ infodata.cpp 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,7 +1,7 @@ /**************************************************************************** -** $Id$ +** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of an example program for Qt. This example ** program may be used, distributed and modified without limitation. Index: infodata.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/examples/network/infoprotocol/infoserver/infodata.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- infodata.h 22 Sep 2005 12:59:52 -0000 1.1.1.4 +++ infodata.h 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,7 +1,7 @@ /**************************************************************************** -** $Id$ +** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of an example program for Qt. This example ** program may be used, distributed and modified without limitation. Index: main.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/examples/network/infoprotocol/infoserver/main.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- main.cpp 22 Sep 2005 12:59:52 -0000 1.1.1.4 +++ main.cpp 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,7 +1,7 @@ /**************************************************************************** -** $Id$ +** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of an example program for Qt. This example ** program may be used, distributed and modified without limitation. Index: server.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/examples/network/infoprotocol/infoserver/server.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- server.cpp 22 Sep 2005 12:59:52 -0000 1.1.1.4 +++ server.cpp 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,7 +1,7 @@ /**************************************************************************** -** $Id$ +** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of an example program for Qt. This example ** program may be used, distributed and modified without limitation. Index: server.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/examples/network/infoprotocol/infoserver/server.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- server.h 22 Sep 2005 12:59:52 -0000 1.1.1.4 +++ server.h 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,7 +1,7 @@ /**************************************************************************** -** $Id$ +** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of an example program for Qt. This example ** program may be used, distributed and modified without limitation. |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:21
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/hpux-acc-o64 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/hpux-acc-o64 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/hpux-acc-o64/qmake.conf,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qmake.conf 22 Sep 2005 12:58:56 -0000 1.1.1.7 +++ qmake.conf 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for hpux-o64 # |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:21
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/aix-g++-64 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/aix-g++-64 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/aix-g++-64/qmake.conf,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- qmake.conf 22 Sep 2005 12:58:56 -0000 1.1.1.2 +++ qmake.conf 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for aix-g++-64 # |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:21
|
Update of /cvsroot/kde-cygwin/qt-3/src/codecs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/codecs Modified Files: qfonthkcodec.cpp qfontlaocodec.cpp qtextcodecfactory.cpp qtextcodecfactory.h qtextcodecinterface_p.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qfonthkcodec.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/codecs/qfonthkcodec.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qfonthkcodec.cpp 22 Sep 2005 12:54:46 -0000 1.1.1.7 +++ qfonthkcodec.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Hong Kong Font utilities for X11 ** ** Created : 20020902 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qfontlaocodec.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/codecs/qfontlaocodec.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qfontlaocodec.cpp 22 Sep 2005 12:54:44 -0000 1.1.1.7 +++ qfontlaocodec.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Font utilities for X11 ** ** Created : 20001101 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qtextcodecfactory.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/codecs/qtextcodecfactory.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qtextcodecfactory.cpp 22 Sep 2005 12:54:50 -0000 1.1.1.4 +++ qtextcodecfactory.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 010130 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qtextcodecfactory.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/codecs/qtextcodecfactory.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qtextcodecfactory.h 22 Sep 2005 12:54:44 -0000 1.1.1.7 +++ qtextcodecfactory.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QTextCodecFactory class ** -** Copyright (C) 2001-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qtextcodecinterface_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/codecs/qtextcodecinterface_p.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qtextcodecinterface_p.h 22 Sep 2005 12:54:26 -0000 1.1.1.7 +++ qtextcodecinterface_p.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QTextCodecFactoryInterface interface ** -** Copyright (C) 2001-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2001-2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:21
|
Update of /cvsroot/kde-cygwin/qt-3/src/embedded In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/embedded Modified Files: qgfxdriverinterface_p.h qkbddriverinterface_p.h qmousedriverinterface_p.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qgfxdriverinterface_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/embedded/qgfxdriverinterface_p.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qgfxdriverinterface_p.h 22 Sep 2005 12:54:22 -0000 1.1.1.6 +++ qgfxdriverinterface_p.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of Qt/Embedded Graphics Driver Interface ** ** Created : 20020211 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qkbddriverinterface_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/embedded/qkbddriverinterface_p.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qkbddriverinterface_p.h 22 Sep 2005 12:54:21 -0000 1.1.1.6 +++ qkbddriverinterface_p.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of Qt/Embedded Keyboard Driver Interface ** ** Created : 20020218 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qmousedriverinterface_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/embedded/qmousedriverinterface_p.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qmousedriverinterface_p.h 22 Sep 2005 12:54:21 -0000 1.1.1.6 +++ qmousedriverinterface_p.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of Qt/Embedded Mouse Driver Interface ** ** Created : 20020220 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:21
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/hpuxi-acc-64 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/hpuxi-acc-64 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/hpuxi-acc-64/qmake.conf,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qmake.conf 22 Sep 2005 12:58:57 -0000 1.1.1.5 +++ qmake.conf 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for hpuxi-acc-64 # |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:21
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/macx-pbuilder In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/macx-pbuilder Modified Files: qplatformdefs.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qplatformdefs.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/macx-pbuilder/qplatformdefs.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- qplatformdefs.h 22 Sep 2005 12:58:56 -0000 1.1.1.3 +++ qplatformdefs.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -75,11 +75,7 @@ #define QT_SIGNAL_ARGS int #define QT_SIGNAL_IGNORE (void (*)(int))1 -#if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4) -#define QT_SOCKLEN_T socklen_t -#else #define QT_SOCKLEN_T int -#endif #define QT_SNPRINTF ::snprintf #define QT_VSNPRINTF ::vsnprintf |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:20
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/irix-cc-64 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/irix-cc-64 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/irix-cc-64/qmake.conf,v retrieving revision 1.1.1.9 retrieving revision 1.2 diff -u -r1.1.1.9 -r1.2 --- qmake.conf 22 Sep 2005 12:58:57 -0000 1.1.1.9 +++ qmake.conf 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for irix-cc-64 # |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:20
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/win32-msvc.net In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/win32-msvc.net Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/win32-msvc.net/qmake.conf,v retrieving revision 1.1.1.12 retrieving revision 1.2 diff -u -r1.1.1.12 -r1.2 --- qmake.conf 22 Sep 2005 12:58:56 -0000 1.1.1.12 +++ qmake.conf 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for win32-msvc.net # @@ -20,7 +20,7 @@ QMAKE_LEXFLAGS = QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -nologo -Zm200 +QMAKE_CFLAGS = -nologo -Zm200 -EHsc QMAKE_CFLAGS_WARN_ON = -W3 QMAKE_CFLAGS_WARN_OFF = -W0 QMAKE_CFLAGS_RELEASE = -O1 |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:20
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/hpux-g++-64 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/hpux-g++-64 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/hpux-g++-64/qmake.conf,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- qmake.conf 22 Sep 2005 12:58:57 -0000 1.1.1.2 +++ qmake.conf 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for hpux-g++-64 # |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:19
|
Update of /cvsroot/kde-cygwin/qt-3/src/sql/drivers/mysql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/sql/drivers/mysql Modified Files: qsql_mysql.cpp Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qsql_mysql.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/drivers/mysql/qsql_mysql.cpp,v retrieving revision 1.1.1.9 retrieving revision 1.2 diff -u -r1.1.1.9 -r1.2 --- qsql_mysql.cpp 22 Sep 2005 12:53:49 -0000 1.1.1.9 +++ qsql_mysql.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 001103 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** @@ -500,7 +500,7 @@ NULL, optionFlags ) ) { - if ( !db.isEmpty() && mysql_select_db( d->mysql, db )) { + if ( mysql_select_db( d->mysql, db )) { setLastError( qMakeError("Unable open database '" + db + "'", QSqlError::Connection, d ) ); mysql_close( d->mysql ); setOpenError( TRUE ); |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:18
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/hpuxi-acc-32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/hpuxi-acc-32 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/hpuxi-acc-32/qmake.conf,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- qmake.conf 22 Sep 2005 12:58:57 -0000 1.1.1.2 +++ qmake.conf 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for hpuxi-acc-32 # |
Update of /cvsroot/kde-cygwin/qt-3/tools/assistant In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/tools/assistant Modified Files: LICENSE.GPL config.cpp config.h docuparser.cpp docuparser.h finddialog.ui.h helpdialogimpl.cpp helpdialogimpl.h helpwindow.cpp helpwindow.h index.cpp index.h mainwindow.ui profile.cpp profile.h settingsdialogimpl.cpp settingsdialogimpl.h tabbedbrowser.ui.h topicchooserimpl.cpp topicchooserimpl.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: LICENSE.GPL =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/LICENSE.GPL,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- LICENSE.GPL 22 Sep 2005 12:57:46 -0000 1.1.1.3 +++ LICENSE.GPL 23 Sep 2005 09:40:30 -0000 1.2 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin Steet, Fifth Floor, Boston, MA 02110-1301, USA + 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Index: config.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/config.cpp,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- config.cpp 22 Sep 2005 12:57:45 -0000 1.1.1.6 +++ config.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -230,7 +230,7 @@ void Config::saveProfile( Profile *profile ) { - if (profil && profil->profileType() == Profile::UserProfile) + if (profil->profileType() == Profile::UserProfile) return; QSettings settings; settings.insertSearchPath( QSettings::Windows, "/Trolltech" ); Index: config.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/config.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- config.h 22 Sep 2005 12:57:46 -0000 1.1.1.3 +++ config.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** Index: docuparser.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/docuparser.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- docuparser.cpp 22 Sep 2005 12:57:45 -0000 1.1.1.4 +++ docuparser.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** Index: docuparser.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/docuparser.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- docuparser.h 22 Sep 2005 12:57:46 -0000 1.1.1.3 +++ docuparser.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** Index: finddialog.ui.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/finddialog.ui.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- finddialog.ui.h 22 Sep 2005 12:57:44 -0000 1.1.1.5 +++ finddialog.ui.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** Index: helpdialogimpl.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/helpdialogimpl.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- helpdialogimpl.cpp 22 Sep 2005 12:57:44 -0000 1.1.1.7 +++ helpdialogimpl.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** @@ -304,7 +304,7 @@ bar->setTotalSteps( 100 ); bar->setProgress( 0 ); - keywordDocuments.clear(); + QValueList<IndexKeyword> lst; QFile indexFile( cacheFilesPath + "indexdb." + Config::configuration()->profileName() ); @@ -351,17 +351,10 @@ QString lastKeyword = QString::null; QValueList<IndexKeyword>::ConstIterator it = lst.begin(); for ( ; it != lst.end(); ++it ) { - if ( lastKeyword.lower() != (*it).keyword.lower() ) - lastItem = new HelpNavigationListItem( listIndex, (*it).keyword ); - lastItem->addLink( (*it).link ); - lastKeyword = (*it).keyword; - - QString lnk = (*it).link; - int i = lnk.findRev('#'); - if ( i > -1 ) - lnk = lnk.left( i ); - if (!keywordDocuments.contains(lnk)) - keywordDocuments.append(lnk); + if ( lastKeyword.lower() != (*it).keyword.lower() ) + lastItem = new HelpNavigationListItem( listIndex, (*it).keyword ); + lastItem->addLink( (*it).link ); + lastKeyword = (*it).keyword; } framePrepare->hide(); showInitDoneMessage(); @@ -912,14 +905,18 @@ if ( fullTextIndex ) return; - QStringList documentList; + QMap<QString, QString>::ConstIterator it = titleMap.begin(); + QStringList documentList; + for ( ; it != titleMap.end(); ++it ) + documentList << it.key(); + QString pname = Config::configuration()->profileName(); fullTextIndex = new Index( documentList, QDir::homeDirPath() ); // ### Is this correct ? if (!verifyDirectory(cacheFilesPath)) { - QMessageBox::warning(help, tr("Qt Assistant"), - tr("Failed to save fulltext search index\n" - "Assistant will not work!")); - return; + QMessageBox::warning(help, tr("Qt Assistant"), + tr("Failed to save fulltext search index\n" + "Assistant will not work!")); + return; } searchButton->setEnabled(FALSE); helpButton->setEnabled(FALSE); @@ -930,50 +927,31 @@ processEvents(); connect( fullTextIndex, SIGNAL( indexingProgress( int ) ), - this, SLOT( setIndexingProgress( int ) ) ); + this, SLOT( setIndexingProgress( int ) ) ); QFile f( cacheFilesPath + "indexdb.dict." + pname ); if ( !f.exists() ) { - QMap<QString, QString>::ConstIterator it = titleMap.begin(); - QString documentName; - for ( ; it != titleMap.end(); ++it ) { - documentName = it.key(); - int i = documentName.findRev('#'); - if ( i > -1 ) - documentName = documentName.left( i ); - - if (!documentList.contains(documentName)) - documentList << documentName; - } - loadIndexFile(); - for (QStringList::Iterator it2 = keywordDocuments.begin(); it2 != keywordDocuments.end(); ++it2) { - if (!documentList.contains(*it2)) - documentList << *it2; - } - fullTextIndex->setDocList( documentList ); - - help->statusBar()->clear(); - setCursor( waitCursor ); - labelPrepare->setText( tr( "Indexing files..." ) ); - progressPrepare->setTotalSteps( 100 ); - progressPrepare->reset(); - progressPrepare->show(); - framePrepare->show(); - processEvents(); - if ( fullTextIndex->makeIndex() != -1 ) { - fullTextIndex->writeDict(); - progressPrepare->setProgress( 100 ); - framePrepare->hide(); - setCursor( arrowCursor ); - showInitDoneMessage(); - keywordDocuments.clear(); - } + help->statusBar()->clear(); + setCursor( waitCursor ); + labelPrepare->setText( tr( "Indexing files..." ) ); + progressPrepare->setTotalSteps( 100 ); + progressPrepare->reset(); + progressPrepare->show(); + framePrepare->show(); + processEvents(); + if ( fullTextIndex->makeIndex() != -1 ) { + fullTextIndex->writeDict(); + progressPrepare->setProgress( 100 ); + framePrepare->hide(); + setCursor( arrowCursor ); + showInitDoneMessage(); + } } else { - setCursor( waitCursor ); - help->statusBar()->message( tr( "Reading dictionary..." ) ); - processEvents(); - fullTextIndex->readDict(); - help->statusBar()->message( tr( "Done" ), 3000 ); - setCursor( arrowCursor ); + setCursor( waitCursor ); + help->statusBar()->message( tr( "Reading dictionary..." ) ); + processEvents(); + fullTextIndex->readDict(); + help->statusBar()->message( tr( "Done" ), 3000 ); + setCursor( arrowCursor ); } searchButton->setEnabled(TRUE); termsEdit->setEnabled(TRUE); Index: helpdialogimpl.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/helpdialogimpl.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- helpdialogimpl.h 22 Sep 2005 12:57:43 -0000 1.1.1.6 +++ helpdialogimpl.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** @@ -158,7 +158,6 @@ QDict<ContentList> contentList; QPopupMenu *itemPopup; QString cacheFilesPath; - QStringList keywordDocuments; }; #endif Index: helpwindow.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/helpwindow.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- helpwindow.cpp 22 Sep 2005 12:57:47 -0000 1.1.1.7 +++ helpwindow.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -52,8 +52,7 @@ : QTextBrowser( parent, name ), mw( w ), blockScroll( FALSE ), shiftPressed( FALSE ), newWindow( FALSE ) { - connect(this, SIGNAL(forwardAvailable(bool)), this, SLOT(updateForward(bool))); - connect(this, SIGNAL(backwardAvailable(bool)), this, SLOT(updateBackward(bool))); + } void HelpWindow::setSource( const QString &name ) @@ -73,14 +72,14 @@ if( linkInfo.isRelative() ) target = currentInfo.dirPath( TRUE ) + "/" + name; - nmw->setup(); + nmw->setup(); + nmw->showLink( target ); nmw->move( mw->geometry().topLeft() ); if ( mw->isMaximized() ) nmw->showMaximized(); else nmw->show(); - nmw->showLink( target ); - return; + return; } if ( name.left( 7 ) == "http://" || name.left( 6 ) == "ftp://" ) { @@ -264,12 +263,3 @@ } } -void HelpWindow::updateForward(bool fwd) -{ - fwdAvail = fwd; -} - -void HelpWindow::updateBackward(bool back) -{ - backAvail = back; -} Index: helpwindow.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/helpwindow.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- helpwindow.h 22 Sep 2005 12:57:46 -0000 1.1.1.7 +++ helpwindow.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -49,9 +49,6 @@ void contentsMousePressEvent(QMouseEvent *e); void keyPressEvent(QKeyEvent *); - bool isBackwardAvailable() const { return backAvail; } - bool isForwardAvailable() const { return fwdAvail; } - signals: void chooseWebBrowser(); @@ -63,8 +60,6 @@ private slots: void openLinkInNewWindow(); void openLinkInNewPage(); - void updateForward(bool); - void updateBackward(bool); private: MainWindow *mw; @@ -73,8 +68,7 @@ bool shiftPressed; bool newWindow; QMimeSourceFactory *mimeSourceFactory; - bool fwdAvail; - bool backAvail; + }; #endif Index: index.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/index.cpp,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- index.cpp 22 Sep 2005 12:57:46 -0000 1.1.1.8 +++ index.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -91,11 +91,6 @@ docListFile = f; } -void Index::setDocList( const QStringList &lst ) -{ - docList = lst; -} - int Index::makeIndex() { if ( !alreadyHaveDocList ) Index: index.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/index.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- index.h 22 Sep 2005 12:57:47 -0000 1.1.1.4 +++ index.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -77,7 +77,6 @@ QString getDocumentTitle( const QString& ); void setDictionaryFile( const QString& ); void setDocListFile( const QString& ); - void setDocList( const QStringList & ); signals: void indexingProgress( int ); Index: mainwindow.ui =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/mainwindow.ui,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- mainwindow.ui 22 Sep 2005 12:57:46 -0000 1.1.1.7 +++ mainwindow.ui 23 Sep 2005 09:40:30 -0000 1.2 @@ -648,7 +648,6 @@ <slot>updateProfileSettings()</slot> <slot>backwardAvailable(bool)</slot> <slot>forwardAvailable(bool)</slot> - <slot>browserTabChanged()</slot> </slots> <functions> <function access="private">setupGoActions()</function> Index: profile.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/profile.cpp,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- profile.cpp 22 Sep 2005 12:57:46 -0000 1.1.1.2 +++ profile.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -36,12 +36,9 @@ #define LINGUIST_TITLE "Guide to the Qt Translation Tools" #define QMAKE_TITLE "qmake User Guide" -Profile *Profile::createDefaultProfile( const QString &docPath ) +Profile *Profile::createDefaultProfile() { - QString path = qInstallPathDocs(); - if ( !docPath.isEmpty() ) - path = docPath; - path = path + "/html/"; + QString path = QString( qInstallPathDocs() ) + "/html/"; Profile *profile = new Profile; profile->valid = TRUE; profile->type = DefaultProfile; Index: profile.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/profile.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- profile.h 22 Sep 2005 12:57:47 -0000 1.1.1.2 +++ profile.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the Qt Assistant. ** @@ -57,7 +57,7 @@ inline DocuParser *docuParser() const { return dparser; } inline void setDocuParser( DocuParser *dp ) { dparser = dp; } - static Profile* createDefaultProfile( const QString &docPath = QString::null ); + static Profile* createDefaultProfile(); static QString makeRelativePath( const QString &base, const QString &path ); int valid:1; Index: settingsdialogimpl.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/settingsdialogimpl.cpp,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- settingsdialogimpl.cpp 22 Sep 2005 12:57:47 -0000 1.1.1.5 +++ settingsdialogimpl.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** Index: settingsdialogimpl.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/settingsdialogimpl.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- settingsdialogimpl.h 22 Sep 2005 12:57:44 -0000 1.1.1.4 +++ settingsdialogimpl.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** Index: tabbedbrowser.ui.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/tabbedbrowser.ui.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- tabbedbrowser.ui.h 22 Sep 2005 12:57:47 -0000 1.1.1.3 +++ tabbedbrowser.ui.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -143,8 +143,6 @@ connect( tab, SIGNAL( currentChanged( QWidget* ) ), this, SLOT( transferFocus() ) ); - connect( tab, SIGNAL( currentChanged( QWidget* ) ), - mainWindow(), SLOT( browserTabChanged() ) ); QTabBar *tabBar = (QTabBar*)tab->child( 0, "QTabBar", FALSE ); int m = ( tabBar ? style().pixelMetric( QStyle::PM_TabBarTabVSpace, (QWidget*)tabBar ) Index: topicchooserimpl.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/topicchooserimpl.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- topicchooserimpl.cpp 22 Sep 2005 12:57:47 -0000 1.1.1.4 +++ topicchooserimpl.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** Index: topicchooserimpl.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/tools/assistant/topicchooserimpl.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- topicchooserimpl.h 22 Sep 2005 12:57:44 -0000 1.1.1.4 +++ topicchooserimpl.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,5 +1,5 @@ /********************************************************************** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of Qt Assistant. ** |
Update of /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/3rdparty/sqlite Modified Files: attach.c auth.c btree.c btree.h btree_rb.c build.c copy.c date.c delete.c expr.c func.c hash.c hash.h insert.c main.c pager.c pager.h pragma.c random.c select.c shell.c sqlite.h sqliteInt.h tokenize.c update.c util.c vacuum.c vdbe.c vdbe.h where.c Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: attach.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/attach.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- attach.c 22 Sep 2005 12:56:45 -0000 1.1.1.4 +++ attach.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to implement the ATTACH and DETACH commands. ** -** $Id$ +** */ #include "sqliteInt.h" Index: auth.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/auth.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- auth.c 22 Sep 2005 12:56:47 -0000 1.1.1.4 +++ auth.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -14,7 +14,7 @@ ** systems that do not need this facility may omit it by recompiling ** the library with -DSQLITE_OMIT_AUTHORIZATION=1 ** -** $Id$ +** */ #include "sqliteInt.h" Index: btree.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/btree.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- btree.c 22 Sep 2005 12:56:58 -0000 1.1.1.4 +++ btree.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -9,7 +9,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id$ +** ** ** This file implements a external (disk-based) database using BTrees. ** For a detailed discussion of BTrees, refer to Index: btree.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/btree.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- btree.h 22 Sep 2005 12:56:58 -0000 1.1.1.4 +++ btree.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -13,7 +13,7 @@ ** subsystem. See comments in the source code for a detailed description ** of what each interface routine does. ** -** @(#) $Id$ +** @(#) */ #ifndef _BTREE_H_ #define _BTREE_H_ Index: btree_rb.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/btree_rb.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- btree_rb.c 22 Sep 2005 12:56:47 -0000 1.1.1.4 +++ btree_rb.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -9,7 +9,7 @@ ** May you share freely, never taking more than you give. ** ************************************************************************* -** $Id$ +** ** ** This file implements an in-core database using Red-Black balanced ** binary trees. Index: build.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/build.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- build.c 22 Sep 2005 12:56:58 -0000 1.1.1.4 +++ build.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -23,7 +23,7 @@ ** ROLLBACK ** PRAGMA ** -** $Id$ +** */ #include "sqliteInt.h" #include <ctype.h> Index: copy.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/copy.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- copy.c 22 Sep 2005 12:56:47 -0000 1.1.1.4 +++ copy.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to implement the COPY command. ** -** $Id$ +** */ #include "sqliteInt.h" Index: date.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/date.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- date.c 22 Sep 2005 12:56:47 -0000 1.1.1.4 +++ date.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -16,7 +16,7 @@ ** sqliteRegisterDateTimeFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id$ +** ** ** NOTES: ** Index: delete.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/delete.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- delete.c 22 Sep 2005 12:56:49 -0000 1.1.1.4 +++ delete.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle DELETE FROM statements. ** -** $Id$ +** */ #include "sqliteInt.h" Index: expr.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/expr.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- expr.c 22 Sep 2005 12:56:48 -0000 1.1.1.4 +++ expr.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -12,7 +12,7 @@ ** This file contains routines used for analyzing expressions and ** for generating VDBE code that evaluates expressions in SQLite. ** -** $Id$ +** */ #include "sqliteInt.h" #include <ctype.h> Index: func.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/func.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- func.c 22 Sep 2005 12:56:48 -0000 1.1.1.4 +++ func.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -16,7 +16,7 @@ ** sqliteRegisterBuildinFunctions() found at the bottom of the file. ** All other code has file scope. ** -** $Id$ +** */ #include <ctype.h> #include <math.h> Index: hash.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/hash.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- hash.c 22 Sep 2005 12:56:49 -0000 1.1.1.4 +++ hash.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -12,7 +12,7 @@ ** This is the implementation of generic hash-tables ** used in SQLite. ** -** $Id$ +** */ #include "sqliteInt.h" #include <assert.h> Index: hash.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/hash.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- hash.h 22 Sep 2005 12:56:49 -0000 1.1.1.4 +++ hash.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -12,7 +12,7 @@ ** This is the header file for the generic hash-table implemenation ** used in SQLite. ** -** $Id$ +** */ #ifndef _SQLITE_HASH_H_ #define _SQLITE_HASH_H_ Index: insert.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/insert.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- insert.c 22 Sep 2005 12:56:59 -0000 1.1.1.4 +++ insert.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle INSERT statements in SQLite. ** -** $Id$ +** */ #include "sqliteInt.h" Index: main.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/main.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- main.c 22 Sep 2005 12:56:49 -0000 1.1.1.4 +++ main.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -14,7 +14,7 @@ ** other files are for internal use by SQLite and should not be ** accessed by users of the library. ** -** $Id$ +** */ #include "sqliteInt.h" #include "os.h" Index: pager.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/pager.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- pager.c 22 Sep 2005 12:56:53 -0000 1.1.1.4 +++ pager.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -18,7 +18,7 @@ ** file simultaneously, or one process from reading the database while ** another is writing. ** -** @(#) $Id$ +** @(#) */ #include "os.h" /* Must be first to enable large file support */ #include "sqliteInt.h" Index: pager.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/pager.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- pager.h 22 Sep 2005 12:56:53 -0000 1.1.1.4 +++ pager.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -13,7 +13,7 @@ ** subsystem. The page cache subsystem reads and writes a file a page ** at a time and provides a journal for rollback. ** -** @(#) $Id$ +** @(#) */ /* Index: pragma.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/pragma.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- pragma.c 22 Sep 2005 12:56:50 -0000 1.1.1.4 +++ pragma.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -11,7 +11,7 @@ ************************************************************************* ** This file contains code used to implement the PRAGMA command. ** -** $Id$ +** */ #include "sqliteInt.h" #include <ctype.h> Index: random.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/random.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- random.c 22 Sep 2005 12:56:48 -0000 1.1.1.4 +++ random.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -15,7 +15,7 @@ ** Random numbers are used by some of the database backends in order ** to generate random integer keys for tables or random filenames. ** -** $Id$ +** */ #include "sqliteInt.h" #include "os.h" Index: select.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/select.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- select.c 22 Sep 2005 12:56:50 -0000 1.1.1.4 +++ select.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle SELECT statements in SQLite. ** -** $Id$ +** */ #include "sqliteInt.h" Index: shell.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/shell.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- shell.c 22 Sep 2005 12:56:46 -0000 1.1.1.4 +++ shell.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -12,7 +12,7 @@ ** This file contains code to implement the "sqlite" command line ** utility for accessing SQLite databases. ** -** $Id$ +** */ #include <stdlib.h> #include <string.h> Index: sqlite.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/sqlite.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- sqlite.h 22 Sep 2005 12:56:47 -0000 1.1.1.4 +++ sqlite.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -12,7 +12,7 @@ ** This header file defines the interface that the SQLite library ** presents to client programs. ** -** @(#) $Id$ +** @(#) */ #ifndef _SQLITE_H_ #define _SQLITE_H_ Index: sqliteInt.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/sqliteInt.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- sqliteInt.h 22 Sep 2005 12:56:45 -0000 1.1.1.4 +++ sqliteInt.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -11,7 +11,7 @@ ************************************************************************* ** Internal interface definitions for SQLite. ** -** @(#) $Id$ +** @(#) */ #include "config.h" #include "sqlite.h" Index: tokenize.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/tokenize.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- tokenize.c 22 Sep 2005 12:56:56 -0000 1.1.1.4 +++ tokenize.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -15,7 +15,7 @@ ** individual tokens and sends those tokens one-by-one over to the ** parser for analysis. ** -** $Id$ +** */ #include "sqliteInt.h" #include "os.h" Index: update.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/update.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- update.c 22 Sep 2005 12:56:47 -0000 1.1.1.4 +++ update.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -12,7 +12,7 @@ ** This file contains C code routines that are called by the parser ** to handle UPDATE statements. ** -** $Id$ +** */ #include "sqliteInt.h" Index: util.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/util.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- util.c 22 Sep 2005 12:56:52 -0000 1.1.1.4 +++ util.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -14,7 +14,7 @@ ** This file contains functions for allocating memory, comparing ** strings, and stuff like that. ** -** $Id$ +** */ #include "sqliteInt.h" #include <stdarg.h> Index: vacuum.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/vacuum.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- vacuum.c 22 Sep 2005 12:56:54 -0000 1.1.1.4 +++ vacuum.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -14,7 +14,7 @@ ** Most of the code in this file may be omitted by defining the ** SQLITE_OMIT_VACUUM macro. ** -** $Id$ +** */ #include "sqliteInt.h" #include "os.h" Index: vdbe.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/vdbe.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- vdbe.c 22 Sep 2005 12:56:52 -0000 1.1.1.4 +++ vdbe.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -43,7 +43,7 @@ ** in this file for details. If in doubt, do not deviate from existing ** commenting and indentation practices when changing or adding code. ** -** $Id$ +** */ #include "sqliteInt.h" #include "os.h" Index: vdbe.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/vdbe.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- vdbe.h 22 Sep 2005 12:56:52 -0000 1.1.1.4 +++ vdbe.h 23 Sep 2005 09:40:29 -0000 1.2 @@ -15,7 +15,7 @@ ** or VDBE. The VDBE implements an abstract machine that runs a ** simple program to access and modify the underlying database. ** -** $Id$ +** */ #ifndef _SQLITE_VDBE_H_ #define _SQLITE_VDBE_H_ Index: where.c =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/3rdparty/sqlite/where.c,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- where.c 22 Sep 2005 12:56:56 -0000 1.1.1.4 +++ where.c 23 Sep 2005 09:40:29 -0000 1.2 @@ -12,7 +12,7 @@ ** This module contains C code that generates VDBE code used to process ** the WHERE clause of SQL statements. ** -** $Id$ +** */ #include "sqliteInt.h" |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:17
|
Update of /cvsroot/kde-cygwin/qt-3/src/table In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/table Modified Files: qtable.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qtable.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/table/qtable.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qtable.h 22 Sep 2005 12:54:01 -0000 1.1.1.7 +++ qtable.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 000607 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the table module of the Qt GUI Toolkit. ** |
Update of /cvsroot/kde-cygwin/qt-3/src/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/sql Modified Files: qdatabrowser.cpp qdatabrowser.h qdataview.cpp qdataview.h qeditorfactory.cpp qeditorfactory.h qsql.cpp qsql.h qsqlcursor.h qsqldatabase.cpp qsqldatabase.h qsqldriver.cpp qsqldriver.h qsqldriverinterface_p.h qsqleditorfactory.cpp qsqleditorfactory.h qsqlerror.cpp qsqlerror.h qsqlextension_p.cpp qsqlextension_p.h qsqlfield.cpp qsqlfield.h qsqlform.cpp qsqlform.h qsqlindex.cpp qsqlindex.h qsqlmanager_p.h qsqlpropertymap.cpp qsqlpropertymap.h qsqlquery.h qsqlrecord.cpp qsqlrecord.h qsqlresult.cpp qsqlresult.h qsqlselectcursor.cpp qsqlselectcursor.h qt_sql.pri Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qdatabrowser.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qdatabrowser.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qdatabrowser.cpp 22 Sep 2005 12:53:48 -0000 1.1.1.7 +++ qdatabrowser.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qdatabrowser.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qdatabrowser.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- qdatabrowser.h 22 Sep 2005 12:53:45 -0000 1.1.1.3 +++ qdatabrowser.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qdataview.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qdataview.cpp,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- qdataview.cpp 22 Sep 2005 12:53:44 -0000 1.1.1.3 +++ qdataview.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qdataview.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qdataview.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- qdataview.h 22 Sep 2005 12:53:44 -0000 1.1.1.3 +++ qdataview.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qeditorfactory.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qeditorfactory.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qeditorfactory.cpp 22 Sep 2005 12:53:47 -0000 1.1.1.4 +++ qeditorfactory.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-17 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qeditorfactory.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qeditorfactory.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qeditorfactory.h 22 Sep 2005 12:53:45 -0000 1.1.1.5 +++ qeditorfactory.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsql.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsql.cpp,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qsql.cpp 22 Sep 2005 12:53:46 -0000 1.1.1.6 +++ qsql.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Implementation of QSql class ** ** Created : 2000-11-03 ** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsql.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsql.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qsql.h 22 Sep 2005 12:53:46 -0000 1.1.1.6 +++ qsql.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlcursor.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlcursor.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qsqlcursor.h 22 Sep 2005 12:53:46 -0000 1.1.1.5 +++ qsqlcursor.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqldatabase.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqldatabase.cpp,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qsqldatabase.cpp 22 Sep 2005 12:53:47 -0000 1.1.1.6 +++ qsqldatabase.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** @@ -387,11 +387,6 @@ database(connectionName)\endlink to retrieve a pointer to the database connection. - \warning If you add a database with the same name as an - existing database, the new database will replace the old one. - This will happen automatically if you call this function more - than once without specifying \a connectionName. - \sa database() removeDatabase() */ QSqlDatabase* QSqlDatabase::addDatabase( const QString& type, const QString& connectionName ) Index: qsqldatabase.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqldatabase.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qsqldatabase.h 22 Sep 2005 12:53:46 -0000 1.1.1.6 +++ qsqldatabase.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqldriver.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqldriver.cpp,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- qsqldriver.cpp 22 Sep 2005 12:53:46 -0000 1.1.1.8 +++ qsqldriver.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqldriver.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqldriver.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qsqldriver.h 22 Sep 2005 12:53:47 -0000 1.1.1.4 +++ qsqldriver.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqldriverinterface_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqldriverinterface_p.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qsqldriverinterface_p.h 22 Sep 2005 12:53:48 -0000 1.1.1.7 +++ qsqldriverinterface_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QSqlDriverInterface class ** ** Created : 2000-11-03 ** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqleditorfactory.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqleditorfactory.cpp,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qsqleditorfactory.cpp 22 Sep 2005 12:53:44 -0000 1.1.1.6 +++ qsqleditorfactory.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqleditorfactory.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqleditorfactory.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- qsqleditorfactory.h 22 Sep 2005 12:53:46 -0000 1.1.1.3 +++ qsqleditorfactory.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlerror.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlerror.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qsqlerror.cpp 22 Sep 2005 12:53:44 -0000 1.1.1.7 +++ qsqlerror.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlerror.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlerror.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qsqlerror.h 22 Sep 2005 12:53:47 -0000 1.1.1.5 +++ qsqlerror.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlextension_p.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlextension_p.cpp,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qsqlextension_p.cpp 22 Sep 2005 12:53:46 -0000 1.1.1.5 +++ qsqlextension_p.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2002-06-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** @@ -61,8 +61,8 @@ bindm = BindByName; // if the index has already been set when doing emulated named // bindings - don't reset it - if ( index.contains( (int)values.count() ) ) { - index[ (int)values.count() ] = placeholder; + if ( index.contains( values.count() ) ) { + index[ values.count() ] = placeholder; } values[ placeholder ] = Param( val, tp ); } Index: qsqlextension_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlextension_p.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qsqlextension_p.h 22 Sep 2005 12:53:44 -0000 1.1.1.4 +++ qsqlextension_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2002-06-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlfield.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlfield.cpp,v retrieving revision 1.1.1.9 retrieving revision 1.2 diff -u -r1.1.1.9 -r1.2 --- qsqlfield.cpp 22 Sep 2005 12:53:44 -0000 1.1.1.9 +++ qsqlfield.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlfield.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlfield.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- qsqlfield.h 22 Sep 2005 12:53:47 -0000 1.1.1.3 +++ qsqlfield.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlform.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlform.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qsqlform.cpp 22 Sep 2005 12:53:46 -0000 1.1.1.4 +++ qsqlform.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlform.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlform.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- qsqlform.h 22 Sep 2005 12:53:43 -0000 1.1.1.3 +++ qsqlform.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlindex.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlindex.cpp,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qsqlindex.cpp 22 Sep 2005 12:53:47 -0000 1.1.1.5 +++ qsqlindex.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2000-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000-2003 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlindex.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlindex.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qsqlindex.h 22 Sep 2005 12:53:44 -0000 1.1.1.6 +++ qsqlindex.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlmanager_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlmanager_p.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- qsqlmanager_p.h 22 Sep 2005 12:53:46 -0000 1.1.1.3 +++ qsqlmanager_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlpropertymap.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlpropertymap.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qsqlpropertymap.cpp 22 Sep 2005 12:53:46 -0000 1.1.1.4 +++ qsqlpropertymap.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-20 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlpropertymap.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlpropertymap.h,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- qsqlpropertymap.h 22 Sep 2005 12:53:44 -0000 1.1.1.3 +++ qsqlpropertymap.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-20 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlquery.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlquery.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qsqlquery.h 22 Sep 2005 12:53:46 -0000 1.1.1.7 +++ qsqlquery.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlrecord.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlrecord.cpp,v retrieving revision 1.1.1.9 retrieving revision 1.2 diff -u -r1.1.1.9 -r1.2 --- qsqlrecord.cpp 22 Sep 2005 12:53:45 -0000 1.1.1.9 +++ qsqlrecord.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlrecord.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlrecord.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qsqlrecord.h 22 Sep 2005 12:53:44 -0000 1.1.1.4 +++ qsqlrecord.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlresult.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlresult.cpp,v retrieving revision 1.1.1.3 retrieving revision 1.2 diff -u -r1.1.1.3 -r1.2 --- qsqlresult.cpp 22 Sep 2005 12:53:47 -0000 1.1.1.3 +++ qsqlresult.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlresult.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlresult.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qsqlresult.h 22 Sep 2005 12:53:46 -0000 1.1.1.6 +++ qsqlresult.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2000-11-03 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlselectcursor.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlselectcursor.cpp,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- qsqlselectcursor.cpp 22 Sep 2005 12:53:46 -0000 1.1.1.2 +++ qsqlselectcursor.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2002-11-13 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qsqlselectcursor.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qsqlselectcursor.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qsqlselectcursor.h 22 Sep 2005 12:53:46 -0000 1.1.1.4 +++ qsqlselectcursor.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 2002-11-13 ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** Index: qt_sql.pri =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/sql/qt_sql.pri,v retrieving revision 1.1.1.11 retrieving revision 1.2 diff -u -r1.1.1.11 -r1.2 --- qt_sql.pri 22 Sep 2005 12:53:47 -0000 1.1.1.11 +++ qt_sql.pri 23 Sep 2005 09:40:30 -0000 1.2 @@ -114,6 +114,12 @@ } } + cygwin-g++ { + !contains( LIBS, .*odbc.* ) { + LIBS *= -lodbc32 + } + } + unix { !contains( LIBS, .*odbc.* ) { LIBS *= -lodbc |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:14
|
Update of /cvsroot/kde-cygwin/qt-3/src/tools In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/tools Modified Files: qdeepcopy.cpp qdeepcopy.h qmutexpool.cpp qmutexpool_p.h qpair.h qptrcollection.h qsemaphore.cpp qsettings_p.h qt_tools.pri qthreadinstance_p.h qthreadstorage.h qthreadstorage_unix.cpp qunicodetables.cpp qunicodetables_p.h qwinexport.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qdeepcopy.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qdeepcopy.cpp,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qdeepcopy.cpp 22 Sep 2005 12:54:13 -0000 1.1.1.6 +++ qdeepcopy.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Implementation of QDeepCopy class ** ** Created : 20020613 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qdeepcopy.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qdeepcopy.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qdeepcopy.h 22 Sep 2005 12:54:07 -0000 1.1.1.6 +++ qdeepcopy.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QDeepCopy class ** ** Created : 20020613 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qmutexpool.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qmutexpool.cpp,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qmutexpool.cpp 22 Sep 2005 12:54:14 -0000 1.1.1.7 +++ qmutexpool.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qmutexpool_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qmutexpool_p.h,v retrieving revision 1.1.1.7 retrieving revision 1.2 diff -u -r1.1.1.7 -r1.2 --- qmutexpool_p.h 22 Sep 2005 12:54:14 -0000 1.1.1.7 +++ qmutexpool_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qpair.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qpair.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qpair.h 22 Sep 2005 12:54:04 -0000 1.1.1.4 +++ qpair.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -3,7 +3,7 @@ ** Definition of QPair class ** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2001 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qptrcollection.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qptrcollection.h,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- qptrcollection.h 22 Sep 2005 12:54:13 -0000 1.1.1.2 +++ qptrcollection.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -3,7 +3,7 @@ ** Definition of base class for all pointer based collection classes ** ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qsemaphore.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qsemaphore.cpp,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qsemaphore.cpp 22 Sep 2005 12:54:10 -0000 1.1.1.4 +++ qsemaphore.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** QSemaphore class for Unix ** ** Created : 20010725 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qsettings_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qsettings_p.h,v retrieving revision 1.1.1.12 retrieving revision 1.2 diff -u -r1.1.1.12 -r1.2 --- qsettings_p.h 22 Sep 2005 12:54:04 -0000 1.1.1.12 +++ qsettings_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,11 +1,11 @@ /**************************************************************************** -** $Id$ +** ** ** Definition of QSettings related classes ** ** Created : 990124 ** -** Copyright (C) 1999-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1999-2002 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** @@ -113,20 +113,22 @@ void sysInit(); void sysClear(); +/* obsolete functions since already handled in public class + QStringList sysReadListEntry( const QString &, bool * = 0 ) const; + QStringList sysReadListEntry( const QString &, const QChar& sep, bool * = 0 ) const; + bool sysWriteEntry( const QString &, const QStringList &, const QChar& sep ) + bool sysWriteEntry( const QString&key, const QStringList&data ) +*/ #if !defined(Q_NO_BOOL_TYPE) bool sysWriteEntry( const QString &, bool ); #endif bool sysWriteEntry( const QString &, double ); bool sysWriteEntry( const QString &, int ); bool sysWriteEntry( const QString &, const QString & ); - bool sysWriteEntry( const QString &, const QStringList & ); - bool sysWriteEntry( const QString &, const QStringList &, const QChar& sep ); QStringList sysEntryList(const QString &) const; QStringList sysSubkeyList(const QString &) const; - QStringList sysReadListEntry( const QString &, bool * = 0 ) const; - QStringList sysReadListEntry( const QString &, const QChar& sep, bool * = 0 ) const; QString sysReadEntry( const QString &, const QString &def = QString::null, bool * = 0 ) const; int sysReadNumEntry( const QString &, int def = 0, bool * = 0 ) const; double sysReadDoubleEntry( const QString &, double def = 0, bool * = 0 ) const; Index: qt_tools.pri =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qt_tools.pri,v retrieving revision 1.1.1.8 retrieving revision 1.2 diff -u -r1.1.1.8 -r1.2 --- qt_tools.pri 22 Sep 2005 12:54:15 -0000 1.1.1.8 +++ qt_tools.pri 23 Sep 2005 09:40:30 -0000 1.2 @@ -69,7 +69,7 @@ $$TOOLS_P/qucom_p.h \ $$TOOLS_H/quuid.h - win32:SOURCES += $$TOOLS_CPP/qdir_win.cpp \ + win32:!unix:SOURCES += $$TOOLS_CPP/qdir_win.cpp \ $$TOOLS_CPP/qfile_win.cpp \ $$TOOLS_CPP/qfileinfo_win.cpp \ $$TOOLS_CPP/qlibrary_win.cpp \ @@ -79,6 +79,9 @@ $$TOOLS_CPP/qthreadstorage_win.cpp \ $$TOOLS_CPP/qcriticalsection_p.cpp + win32:unix:SOURCES += $$TOOLS_CPP/qsettings_win.cpp \ + $$TOOLS_CPP/qcriticalsection_p.cpp + win32-borland:SOURCES += $$TOOLS_CPP/qwinexport.cpp wince-* { Index: qthreadinstance_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qthreadinstance_p.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qthreadinstance_p.h 22 Sep 2005 12:54:21 -0000 1.1.1.5 +++ qthreadinstance_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qthreadstorage.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qthreadstorage.h,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qthreadstorage.h 22 Sep 2005 12:54:06 -0000 1.1.1.5 +++ qthreadstorage.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qthreadstorage_unix.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qthreadstorage_unix.cpp,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qthreadstorage_unix.cpp 22 Sep 2005 12:54:13 -0000 1.1.1.5 +++ qthreadstorage_unix.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ... ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** Index: qunicodetables.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qunicodetables.cpp,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qunicodetables.cpp 22 Sep 2005 12:54:10 -0000 1.1.1.5 +++ qunicodetables.cpp 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** ??? ** -** Copyright (C) 2002-2005 Trolltech AS. All rights reserved. +** Copyright (C) 2002-2003 Trolltech AS. All rights reserved. ** ** This file is part of the kernel module of the Qt GUI Toolkit. ** Index: qunicodetables_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qunicodetables_p.h,v retrieving revision 1.1.1.9 retrieving revision 1.2 diff -u -r1.1.1.9 -r1.2 --- qunicodetables_p.h 22 Sep 2005 12:54:10 -0000 1.1.1.9 +++ qunicodetables_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -3,7 +3,7 @@ ** ** ??? ** -** Copyright (C) 2005 Trolltech AS. All rights reserved. +** Copyright (C) 2003 Trolltech AS. All rights reserved. ** ** This file is part of the widgets module of the Qt GUI Toolkit. ** Index: qwinexport.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/tools/qwinexport.h,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- qwinexport.h 22 Sep 2005 12:54:11 -0000 1.1.1.6 +++ qwinexport.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,9 +1,9 @@ /**************************************************************************** -** $Id$ +** ** ** Global type declarations and definitions ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2002 Trolltech AS. All rights reserved. ** ** This file is part of the tools module of the Qt GUI Toolkit. ** |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:14
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/linux-g++-64 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/linux-g++-64 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/linux-g++-64/qmake.conf,v retrieving revision 1.1.1.5 retrieving revision 1.2 diff -u -r1.1.1.5 -r1.2 --- qmake.conf 22 Sep 2005 12:58:57 -0000 1.1.1.5 +++ qmake.conf 23 Sep 2005 09:40:29 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for linux-g++ # @@ -17,9 +17,6 @@ QMAKE_LEXFLAGS = QMAKE_YACC = yacc QMAKE_YACCFLAGS = -d -QMAKE_YACCFLAGS_MANGLE = -p $base -b $base -QMAKE_YACC_HEADER = $base.tab.h -QMAKE_YACC_SOURCE = $base.tab.c QMAKE_CFLAGS = -pipe QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -Wall -W |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:14
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/linux-ecc-64 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/linux-ecc-64 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/linux-ecc-64/qmake.conf,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- qmake.conf 22 Sep 2005 12:58:57 -0000 1.1.1.2 +++ qmake.conf 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for linux-ecc-64 # |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:13
|
Update of /cvsroot/kde-cygwin/qt-3/src/opengl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src/opengl Modified Files: qgl_x11_p.h Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qgl_x11_p.h =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/opengl/qgl_x11_p.h,v retrieving revision 1.1.1.4 retrieving revision 1.2 diff -u -r1.1.1.4 -r1.2 --- qgl_x11_p.h 22 Sep 2005 12:55:45 -0000 1.1.1.4 +++ qgl_x11_p.h 23 Sep 2005 09:40:30 -0000 1.2 @@ -1,10 +1,10 @@ /**************************************************************************** -** $Id$ +** ** ** Definitions needed for resolving GL/GLX symbols using dlopen() ** under X11. ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. ** ** This file is part of the OpenGL module of the Qt GUI Toolkit. ** |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:13
|
Update of /cvsroot/kde-cygwin/qt-3/src In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/src Modified Files: libqt.map Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: libqt.map =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/src/libqt.map,v retrieving revision 1.1.1.6 retrieving revision 1.2 diff -u -r1.1.1.6 -r1.2 --- libqt.map 22 Sep 2005 12:53:40 -0000 1.1.1.6 +++ libqt.map 23 Sep 2005 09:40:29 -0000 1.2 @@ -101,6 +101,7 @@ qt_display_dc*; qt_enter_modal*; qt_find_obj_child*; + qt_ftp_filename_codec*; qt_generate_epsf*; qt_has_xft*; qt_inheritedBy*; @@ -125,7 +126,6 @@ qt_translateKeyCode*; qt_tryAccelEvent*; qt_tryComposeUnicode*; - qt_tryModalHelper*; qt_ucm_initialize*; qt_use_native_dialogs*; qt_use_xrender*; |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:12
|
Update of /cvsroot/kde-cygwin/qt-3/mkspecs/irix-cc-o32 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/mkspecs/irix-cc-o32 Modified Files: qmake.conf Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: qmake.conf =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/mkspecs/irix-cc-o32/qmake.conf,v retrieving revision 1.1.1.10 retrieving revision 1.2 diff -u -r1.1.1.10 -r1.2 --- qmake.conf 22 Sep 2005 12:58:56 -0000 1.1.1.10 +++ qmake.conf 23 Sep 2005 09:40:28 -0000 1.2 @@ -1,5 +1,5 @@ # -# $Id$ +# # # qmake configuration for irix-cc-o32 # |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:12
|
Update of /cvsroot/kde-cygwin/qt-3/plugins/src/sqldrivers/sqlite In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/plugins/src/sqldrivers/sqlite Modified Files: smain.cpp Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: smain.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/plugins/src/sqldrivers/sqlite/smain.cpp,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- smain.cpp 22 Sep 2005 13:00:41 -0000 1.1.1.2 +++ smain.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 031106 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2003 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:12
|
Update of /cvsroot/kde-cygwin/qt-3/plugins/src/sqldrivers/psql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/plugins/src/sqldrivers/psql Modified Files: main.cpp Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: main.cpp =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/plugins/src/sqldrivers/psql/main.cpp,v retrieving revision 1.1.1.2 retrieving revision 1.2 diff -u -r1.1.1.2 -r1.2 --- main.cpp 22 Sep 2005 13:00:41 -0000 1.1.1.2 +++ main.cpp 23 Sep 2005 09:40:29 -0000 1.2 @@ -4,7 +4,7 @@ ** ** Created : 001103 ** -** Copyright (C) 1992-2005 Trolltech AS. All rights reserved. +** Copyright (C) 1992-2000 Trolltech AS. All rights reserved. ** ** This file is part of the sql module of the Qt GUI Toolkit. ** |
|
From: Christian E. <che...@us...> - 2005-09-23 09:41:11
|
Update of /cvsroot/kde-cygwin/qt-3/doc In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26950/doc Modified Files: freeeditions.doc Log Message: st qt3.3.5 patch - I made the smae mistake like 3.3.4 but don't know what is going wrong there. Seems like our cvs is messed up :( ttt: ---------------------------------------------------------------------- Index: freeeditions.doc =================================================================== RCS file: /cvsroot/kde-cygwin/qt-3/doc/freeeditions.doc,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- freeeditions.doc 1 Oct 2003 07:17:07 -0000 1.1 +++ freeeditions.doc 23 Sep 2005 09:40:27 -0000 1.2 @@ -1,79 +1,77 @@ -/*! - -\page freeeditions.html - -\title Qt Free Edition - -Free (or open source) software is software that comes with a license -that gives users certain rights. In particular the right to use the -software, to modify it, to obtain its source, and to pass it on (under -the same terms). Notice that the term "free" is about rights, not -money. The Free Software Foundation (creators of the GNU GPL) speak -of free in this context as in "free speech", not as in "free beer". - -Trolltech supports the free software concept by providing the Qt Free -Edition. You can use this edition of Qt to create free software, i.e. -software that is licensed under the GNU GPL or a similarly recognized -open source license. Trolltech's support of open source with the Qt Free -Edition has enabled large successful software projects like KDE, to -thrive, with thousands of developers around the world using the Qt Free -Edition at no cost to themselves. Qt Free edition is available for -Unix/X11, Macintosh and Linux/embedded. - -The Free Edition can be downloaded from here: -\l http://www.trolltech.com/dl/qtfree-dl.html. - -It is also possible to develop commercial software using Qt: but to do -so you must buy a commercial license for the \link -commercialeditions.html Professional or Enterprise Edition\endlink. If -you buy a commercial edition of Qt you can sell your software for any -price and with any license you like. Thousands of commercial companies -use commercial editions of Qt to develop the products they sell. - -If you use the Qt Free Edition, there are certain licensing -conditions that the GNU GPL imposes on you, to ensure that your users -enjoy the freedoms guaranteed by the GPL. Users are entitled to: - -\list 1 -\i Run your software for any purpose. -\i Obtain and study your software's source code, and adapt it to their - needs. -\i Redistribute your software and its source code to others (under the - same terms). -\i Improve or modify your software, and release these changes to the - public. -\endlist - -These freedoms apply to all the source code for all the modules your -software is based on, regardless of whether they have been written by -you or by others. The freedoms also apply to any associated interface -definition files, and even include the scripts and control files used -to control compilation and installation of the executable; otherwise -users could not exercise their rights. - -This means that you cannot use the Qt Free Edition if your software -must be built with any modules that impose conditions on you that -contradict the conditions of the GNU GPL, including, but not limited -to, software patents, commercial license agreements, copyrighted -interface definitions or any sort of non-disclosure agreement. In -these circumstances you must use a commercial edition of Qt. - -See the \link faq.html FAQ \endlink for answers to frequently -asked questions on Qt Free Edition licensing and its implications. - -More information on Free and Open Source software is available online: - -\list -\i GNU GPL \l http://www.gnu.org -\i Open Source licensening \l http://www.opensource.org -\endlist - -Information about Qt Commercial License Agreements is available at -\l http://www.trolltech.com/pricing.html or email -<a href="mailto:sa...@tr...">sa...@tr...</a>. - -If you are in doubt what edition of Qt is right for your project, -please contact -<a href="mailto:in...@tr...">in...@tr...</a>. - -*/ +/*! + +\page opensourceedition.html + +\title Qt Open Source Edition + +Open source software (also called "free software") is software that comes +with a license that gives users certain rights. In particular the right to +use the software, to modify it, to obtain its source, and to pass it on +(under the same terms). + +Trolltech supports the open source software concept by providing the Qt Open Source +Edition. You can use this edition of Qt to create open source software, i.e. +software that is licensed under the GNU GPL or a similarly recognized +open source license. Trolltech's support of open source with the Qt Open Source +Edition has enabled large successful software projects like KDE, to +thrive, with thousands of developers around the world using the Qt Open Source +Edition at no cost to themselves. The Qt Open Source Edition is available for +Unix/X11, Macintosh, and embedded Linux. + +The Open Source Edition can be downloaded from here: +\l http://www.trolltech.com/download/. + +It is also possible to develop commercial software using Qt, but to do +so you must buy a commercial license for the \link +commercialeditions.html Professional or Enterprise Edition\endlink. If +you buy a commercial edition of Qt you can sell your software for any +price and with any license you like. Thousands of commercial companies +use commercial editions of Qt to develop the products they sell. + +If you use the Qt Open Source Edition, there are certain licensing +conditions that the GNU GPL imposes on you, to ensure that your users +enjoy the freedoms guaranteed by the GPL. Users are entitled to: + +\list 1 +\i Run your software for any purpose. +\i Obtain and study your software's source code, and adapt it to their + needs. +\i Redistribute your software and its source code to others (under the + same terms). +\i Improve or modify your software, and release these changes to the + public. +\endlist + +These freedoms apply to all the source code for all the modules your +software is based on, regardless of whether they have been written by +you or by others. The freedoms also apply to any associated interface +definition files, and even include the scripts and control files used +to control compilation and installation of the executable; otherwise +users could not exercise their rights. + +This means that you cannot use the Qt Open Source Edition if your software +must be built with any modules that impose conditions on you that +contradict the conditions of the GNU GPL, including, but not limited +to, software patents, commercial license agreements, copyrighted +interface definitions or any sort of non-disclosure agreement. In +these circumstances you must use a commercial edition of Qt. + +See the \link faq.html FAQ \endlink for answers to frequently +asked questions on Qt Open Source Edition licensing and its implications. + +More information on open source software is available online: + +\list +\i GNU GPL: \l http://www.gnu.org/ +\i Open source licensing: \l http://www.opensource.org/ +\endlist + +Information about Qt Commercial License Agreements is available at +\l http://www.trolltech.com/pricing.html. You can also email +<a href="mailto:sa...@tr...">sa...@tr...</a>. + +If you are in doubt what edition of Qt is right for your project, +please contact +<a href="mailto:in...@tr...">in...@tr...</a>. + +*/ |
4 messages has been excluded from this view by a project administrator.
