Qtopia1-6 merge

still to test
bic changes to be resolved
more changes to be made?

1 files changed, 2 insertions, 2 deletions

diff --git a/library/qlibrary_p.h b/library/qlibrary_p.h
index 4734228..33cab6f 100644
--- a/library/qlibrary_p.h
+++ b/library/qlibrary_p.h
@@ -1,68 +1,68 @@
 /**********************************************************************
-** Copyright (C) 2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
-** This file is part of Qtopia Environment.
+** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 
 #ifndef QLIBRARY_P_H
 #define QLIBRARY_P_H
 
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
 // of the QLibrary class.  This header file may change from
 // version to version without notice, or even be removed.
 //
 // We mean it.
 //
 //
 
 #include "qlibrary.h"
 
 //#ifndef QT_NO_COMPONENT
 
 //#ifndef QT_H
 #include "qwindowdefs.h"
 //#ifndef QT_LITE_COMPONENT
 #include "qobject.h"
 //#endif
 //#endif // QT_H
 
 class QTimer;
 class QLibrary;
 class QLibraryInterface;
 
 /*
   Private helper class that saves the platform dependent handle
   and does the unload magic using a QTimer.
 */
 //#ifndef QT_LITE_COMPONENT
 class QLibraryPrivate : public QObject
 {
     Q_OBJECT
 public:
     QLibraryPrivate( QLibrary *lib );
     ~QLibraryPrivate();
  
     void startTimer();
     void killTimer();
 
 #ifdef Q_WS_WIN
     HINSTANCE pHnd;
 #else