[Kde-cygwin-cvs] CVS: qt-3/src/sql qdatabrowser.cpp,1.1.1.7,1.2 qdatabrowser.h,1.1.1.3,1.2 qdataview
Status: Inactive
Brought to you by:
habacker
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 |