55 files changed, 730 insertions, 240 deletions
diff --git a/qmake/include/private/qapplication_p.h b/qmake/include/private/qapplication_p.h
index 6fab6b3..280992e 100644
--- a/qmake/include/private/qapplication_p.h
+++ b/qmake/include/private/qapplication_p.h
@@ -70,18 +70,19 @@ extern bool qt_is_gui_used;
 #ifndef QT_NO_CLIPBOARD
 extern QClipboard *qt_clipboard;
 #endif
 #if defined (Q_OS_WIN32) || defined (Q_OS_CYGWIN)
 extern Qt::WindowsVersion qt_winver;
+#elif defined (Q_OS_MAC)
+extern Qt::MacintoshVersion qt_macver;
 #endif
 #if defined (Q_WS_X11)
 extern int qt_ncols_option;
 #endif
 extern void qt_dispatchEnterLeave( QWidget*, QWidget* );
+extern bool qt_tryModalHelper( QWidget *, QWidget ** = 0 );
 #endif
diff --git a/qmake/include/private/qcom_p.h b/qmake/include/private/qcom_p.h
index 6e7e1c8..5bed8c8c 100644
--- a/qmake/include/private/qcom_p.h
+++ b/qmake/include/private/qcom_p.h
@@ -30,14 +30,14 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QCOM_H
+#ifndef QCOM_P_H
-#define QCOM_H
+#define QCOM_P_H
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
@@ -331,7 +331,7 @@ public:		   \
 #    endif
 #    define Q_EXPORT_INTERFACE() Q_EXPORT_COMPONENT()
 #endif
 #endif //QT_NO_COMPONENT
-#endif //QCOM_H
+#endif //QCOM_P_H
diff --git a/qmake/include/private/qcomlibrary_p.h b/qmake/include/private/qcomlibrary_p.h
index f52f679..3f440c0 100644
--- a/qmake/include/private/qcomlibrary_p.h
+++ b/qmake/include/private/qcomlibrary_p.h
@@ -30,14 +30,14 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QUCOMLIBRARY_H
+#ifndef QCOMLIBRARY_P_H
-#define QUCOMLIBRARY_H
+#define QCOMLIBRARY_P_H
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
@@ -73,7 +73,7 @@ private:
    uint qt_version;
 };
 #endif //QT_NO_COMPONENT
-#endif // QUCOMLIBRARY_H
+#endif
diff --git a/qmake/include/private/qcomplextext_p.h b/qmake/include/private/qcomplextext_p.h
index 2132522..c3aeeb1 100644
--- a/qmake/include/private/qcomplextext_p.h
+++ b/qmake/include/private/qcomplextext_p.h
@@ -1,14 +1,12 @@
 /****************************************************************************
 ** $Id$
 **
 ** Internal header file.
 **
-** Created : 
+** Copyright (C) 2001-2002 Trolltech AS.  All rights reserved.
-**
-** Copyright (C) 2001 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the kernel module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
@@ -32,14 +30,14 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QCOMPLEXTEXT_H
+#ifndef QCOMPLEXTEXT_P_H
-#define QCOMPLEXTEXT_H
+#define QCOMPLEXTEXT_P_H
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
diff --git a/qmake/include/private/qcomponentfactory_p.h b/qmake/include/private/qcomponentfactory_p.h
index 1ac973f..d5c1743 100644
--- a/qmake/include/private/qcomponentfactory_p.h
+++ b/qmake/include/private/qcomponentfactory_p.h
@@ -32,14 +32,14 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QCOMPONENTFACTORY_H
+#ifndef QCOMPONENTFACTORY_P_H
-#define QCOMPONENTFACTORY_H
+#define QCOMPONENTFACTORY_P_H
 #ifndef QT_H
 #include "qcom_p.h"
 #endif // QT_H
 //
@@ -67,7 +67,7 @@ public:
                                   int version = 0, const QString &description = QString::null );
    static bool unregisterComponent( const QUuid &cid );
 };
 #endif // QT_NO_COMPONENT
-#endif // QCOMPONENTFACTORY_H
+#endif // QCOMPONENTFACTORY_P_H
diff --git a/qmake/include/private/qcriticalsection_p.h b/qmake/include/private/qcriticalsection_p.h
index 7d9feca..8dacc62 100644
--- a/qmake/include/private/qcriticalsection_p.h
+++ b/qmake/include/private/qcriticalsection_p.h
@@ -30,14 +30,14 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QCRITICALSECTION_H
+#ifndef QCRITICALSECTION_P_H
-#define QCRITICALSECTION_H
+#define QCRITICALSECTION_P_H
 #ifndef QT_H
 #endif // QT_H
 //
 //  W A R N I N G
diff --git a/qmake/include/private/qdir_p.h b/qmake/include/private/qdir_p.h
index 35dba28..a6c7c91 100644
--- a/qmake/include/private/qdir_p.h
+++ b/qmake/include/private/qdir_p.h
@@ -1,12 +1,12 @@
 /****************************************************************************
 ** $Id$
 **
 ** Definition of some private QDir functions.
 **
-** Created : 2000.11.06
+** Created : 001106
 **
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
@@ -35,13 +35,12 @@
 **
 **********************************************************************/
 #ifndef QDIR_P_H
 #define QDIR_P_H
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
 // of qdir.cpp and qdir_*.cpp.
@@ -50,16 +49,18 @@
 //
 // We mean it.
 //
 //
 #ifndef QT_H
+#include "qregexp.h"
+#include "qvaluelist.h"
 #endif // QT_H
-extern QStringList qt_makeFilterList( const QString & );
+extern QValueList<QRegExp> qt_makeFilterList( const QString & );
+extern bool qt_matchFilterList( const QValueList<QRegExp> &, const QString & );
 extern int qt_cmp_si_sortSpec;
 #if defined(Q_C_CALLBACKS)
 extern "C" {
 #endif
diff --git a/qmake/include/private/qeffects_p.h b/qmake/include/private/qeffects_p.h
index 4178b6f..3b6c212 100644
--- a/qmake/include/private/qeffects_p.h
+++ b/qmake/include/private/qeffects_p.h
@@ -1,12 +1,12 @@
 /****************************************************************************
 ** $Id$
 **
 ** Definition of QEffects functions
 **
-** Created : 2000.06.21
+** Created : 000621
 **
 ** Copyright (C) 2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the widgets module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
diff --git a/qmake/include/private/qeventloop_p.h b/qmake/include/private/qeventloop_p.h
index b64d0df..3a5350e 100644
--- a/qmake/include/private/qeventloop_p.h
+++ b/qmake/include/private/qeventloop_p.h
@@ -1,17 +1,67 @@
+/****************************************************************************
+** $Id$
+**
+** Definition of QEventLoop class
+**
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
+**
+** This file is part of the kernel module of the Qt GUI Toolkit.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses for Qt/Embedded may use this file in accordance with the
+** Qt Embedded Commercial License Agreement provided with the Software.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+**   information about Qt Commercial License Agreements.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
 #ifndef QEVENTLOOP_P_H
 #define QEVENTLOOP_P_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 #include "qplatformdefs.h"
+// SCO OpenServer redefines raise -> kill
+#if defined(raise)
+# undef raise
+#endif
 #include "qwindowdefs.h"
 class QSocketNotifier;
-#if defined(Q_OS_UNIX)
+#if defined(Q_OS_UNIX) || defined (Q_WS_WIN)
 #include <qptrlist.h>
+#endif // Q_OS_UNIX || Q_WS_WIN
+#if defined(Q_OS_UNIX)
 struct QSockNot
 {
    QSocketNotifier *obj;
    int fd;
    fd_set *queue;
 };
@@ -27,12 +77,18 @@ public:
    fd_set enabled_fds;
    fd_set pending_fds;
 };
 #endif // Q_OS_UNIX
+#if defined(Q_WS_WIN)
+struct QSockNot {
+    QSocketNotifier *obj;
+    int fd;
+};
+#endif // Q_WS_WIN
 class QEventLoopPrivate
 {
 public:
    QEventLoopPrivate()
    {
@@ -41,18 +97,20 @@ public:
    void reset() {
        looplevel = 0;
        quitcode = 0;
        quitnow = FALSE;
        exitloop = FALSE;
+        shortcut = FALSE;
    }
    int looplevel;
    int quitcode;
-    bool quitnow;
+    unsigned int quitnow  : 1;
-    bool exitloop;
+    unsigned int exitloop : 1;
+    unsigned int shortcut : 1;
 #if defined(Q_WS_MAC)
    EventLoopTimerRef select_timer;
 #endif
 #if defined(Q_WS_X11)
@@ -66,9 +124,15 @@ public:
    QPtrList<QSockNot> sn_pending_list;
    // highest fd for all socket notifiers
    int sn_highest;
    // 3 socket notifier types - read, write and exception
    QSockNotType sn_vec[3];
 #endif
+#ifdef Q_WS_WIN
+    // pending socket notifiers list
+    QPtrList<QSockNot> sn_pending_list;
+#endif // Q_WS_WIN
 };
 #endif // QEVENTLOOP_P_H
diff --git a/qmake/include/private/qfontcodecs_p.h b/qmake/include/private/qfontcodecs_p.h
index 8222f98..54b0ac1 100644
--- a/qmake/include/private/qfontcodecs_p.h
+++ b/qmake/include/private/qfontcodecs_p.h
@@ -48,14 +48,14 @@
 //
 // We mean it.
 //
 //
 #ifndef QT_H
-#include <qglobal.h>
+#include "qglobal.h"
-#include <qtextcodec.h>
+#include "qtextcodec.h"
 #endif // QT_H
 #ifndef QT_NO_CODECS
 #ifndef QT_NO_BIG_CODECS
diff --git a/qmake/include/private/qfontdata_p.h b/qmake/include/private/qfontdata_p.h
index 917d14f..1eaf80c 100644
--- a/qmake/include/private/qfontdata_p.h
+++ b/qmake/include/private/qfontdata_p.h
@@ -159,12 +159,13 @@ public:
            QStringk;
            HDC         hdc;
            HFONThfont;
            uintstockFont:1;
            uintpaintDevice:1;
+    uint        useTextOutA:1;
    union {
                TEXTMETRICWw;
                TEXTMETRICAa;
    } tm;
            int         lw;
    int cache_cost;
@@ -410,13 +411,13 @@ public:
    int textWidth( const QString &str, int pos, int len, TextRun *cache );
    void drawText( QGfx *gfx, int x, int y, const TextRun *cache );
 #endif
 #if defined( Q_WS_MAC )
    void macSetFont(QPaintDevice *);
-    void drawText(int x, int y, QString s, int len, QPaintDevice *dev, const QRegion *rgn);
+    void drawText(int x, int y, const QString &s, int from, int len, QPaintDevice *dev, const QRegion *rgn, int dir);
    void computeLineWidth();
    void load();
    QFontStruct *fin;
 #endif
 };
diff --git a/qmake/include/private/qgfxdriverinterface_p.h b/qmake/include/private/qgfxdriverinterface_p.h
index 1782ed4..e8259ac 100644
--- a/qmake/include/private/qgfxdriverinterface_p.h
+++ b/qmake/include/private/qgfxdriverinterface_p.h
@@ -27,14 +27,26 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QGFXDRIVERINTERFACE_H
+#ifndef QGFXDRIVERINTERFACE_P_H
-#define QGFXDRIVERINTERFACE_H
+#define QGFXDRIVERINTERFACE_P_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 #ifndef QT_H
 #include <private/qcom_p.h>
 #endif // QT_H
 #ifndef QT_NO_COMPONENT
@@ -50,7 +62,7 @@ struct Q_EXPORT QGfxDriverInterface : public QFeatureListInterface
 {
    virtual QScreen* create( const QString& driver, int displayId ) = 0;
 };
 #endif // QT_NO_COMPONENT
-#endif // QGFXDRIVERINTERFACE_H
+#endif // QGFXDRIVERINTERFACE_P_H
diff --git a/qmake/include/private/qgpluginmanager_p.h b/qmake/include/private/qgpluginmanager_p.h
index e0c0e78..2e4e9c5 100644
--- a/qmake/include/private/qgpluginmanager_p.h
+++ b/qmake/include/private/qgpluginmanager_p.h
@@ -1,12 +1,12 @@
 /**********************************************************************
 ** $Id$
 **
 ** Definition of QGPluginManager class
 **
-** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
@@ -30,14 +30,14 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QGPLUGINMANAGER_H
+#ifndef QGPLUGINMANAGER_P_H
-#define QGPLUGINMANAGER_H
+#define QGPLUGINMANAGER_P_H
 #ifndef QT_H
 #include "qdict.h"
 #include "qlibrary.h"
 #include "quuid.h"
 #include "qstringlist.h"
@@ -101,7 +101,7 @@ inline bool QGPluginManager::autoUnload() const
 {
    return autounload;
 }
 #endif
-#endif //QGPLUGINMANAGER_H
+#endif //QGPLUGINMANAGER_P_H
diff --git a/qmake/include/private/qimageformatinterface_p.h b/qmake/include/private/qimageformatinterface_p.h
index 5f7601c..fd4c256 100644
--- a/qmake/include/private/qimageformatinterface_p.h
+++ b/qmake/include/private/qimageformatinterface_p.h
@@ -1,10 +1,10 @@
 /****************************************************************************
 ** $Id$
 **
-** Definition of ???
+** ...
 **
 ** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the kernel module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
@@ -30,14 +30,14 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QIMAGEFORMATINTERFACE_H
+#ifndef QIMAGEFORMATINTERFACE_P_H
-#define QIMAGEFORMATINTERFACE_H
+#define QIMAGEFORMATINTERFACE_P_H
 #ifndef QT_H
 #include <private/qcom_p.h>
 #endif // QT_H
@@ -69,7 +69,7 @@ struct Q_EXPORT QImageFormatInterface : public QFeatureListInterface
    virtual QRESULT installIOHandler( const QString & ) = 0;
 };
 #endif // QT_NO_COMPONENT
-#endif // QIMAGEFORMATINTERFACE_H
+#endif // QIMAGEFORMATINTERFACE_P_H
diff --git a/qmake/include/private/qinputcontext_p.h b/qmake/include/private/qinputcontext_p.h
index 9ac0d2b..4d94147 100644
--- a/qmake/include/private/qinputcontext_p.h
+++ b/qmake/include/private/qinputcontext_p.h
@@ -84,13 +84,13 @@ public:
    void reset();
    int lookupString(XKeyEvent *, QCString &, KeySym *, Status *) const;
    void setXFontSet(const QFont &);
    void *ic;
-    QString text, lastcompose;
+    QString text;
    QWidget *focusWidget;
    bool composing;
    QFont font;
    XFontSet fontset;
    QMemArray<bool> selectedChars;
 #endif // Q_WS_X11
@@ -112,10 +112,13 @@ private:
    static void setFont( const QWidget *w, const QFont & );
    static void setFocusHint( int x, int y, int w, int h, const QWidget *widget );
    static bool startComposition();
    static bool endComposition( QWidget *fw = 0 );
    static bool composition( LPARAM lparam );
+    static void accept( QWidget *fw = 0 );
+    static void enable( bool );
 #endif
 };
 #endif // QINPUTCONTEXT_P_H
diff --git a/qmake/include/private/qkbddriverinterface_p.h b/qmake/include/private/qkbddriverinterface_p.h
index efc7ded..fe13487 100644
--- a/qmake/include/private/qkbddriverinterface_p.h
+++ b/qmake/include/private/qkbddriverinterface_p.h
@@ -27,14 +27,26 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QKBDDRIVERINTERFACE_H
+#ifndef QKBDDRIVERINTERFACE_P_H
-#define QKBDDRIVERINTERFACE_H
+#define QKBDDRIVERINTERFACE_P_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 #ifndef QT_H
 #include <private/qcom_p.h>
 #endif // QT_H
 #ifndef QT_NO_COMPONENT
@@ -50,7 +62,7 @@ struct Q_EXPORT QKbdDriverInterface : public QFeatureListInterface
 {
    virtual QWSKeyboardHandler* create( const QString& driver, const QString& device ) = 0;
 };
 #endif // QT_NO_COMPONENT
-#endif // QKBDDRIVERINTERFACE_H
+#endif // QKBDDRIVERINTERFACE_P_H
diff --git a/qmake/include/private/qlibrary_p.h b/qmake/include/private/qlibrary_p.h
index c4dd565..1624ca5 100644
--- a/qmake/include/private/qlibrary_p.h
+++ b/qmake/include/private/qlibrary_p.h
@@ -1,12 +1,12 @@
 /****************************************************************************
 ** $Id$
 **
 ** Definition of an internal QLibrary class
 **
-** Created : 2000-01-01
+** Created : 000101
 **
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
@@ -52,15 +52,12 @@
 #include "qlibrary.h"
 #ifndef QT_NO_LIBRARY
 #ifndef QT_H
-#if defined(Q_CC_GNU)
-#warning "avoid including header file \"qwindowdefs.h\" in directory 'tools'"
-#endif
 #include "qwindowdefs.h"
 #endif // QT_H
 class QLibraryPrivate
 {
 public:
diff --git a/qmake/include/private/qlock_p.h b/qmake/include/private/qlock_p.h
new file mode 100644
index 0000000..5c261aa
--- a/dev/null
+++ b/qmake/include/private/qlock_p.h
@@ -0,0 +1,93 @@
+/****************************************************************************
+** $Id$
+**
+** Definition of QLock class. This manages interprocess locking
+**
+** Created : 20000406
+**
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the kernel module of the Qt GUI Toolkit.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses for Qt/Embedded may use this file in accordance with the
+** Qt Embedded Commercial License Agreement provided with the Software.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+**   information about Qt Commercial License Agreements.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+#ifndef QLOCK_P_H
+#define QLOCK_P_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
+#ifndef QT_H
+#include <qstring.h>
+#endif // QT_H
+class QLockData;
+class QLock
+{
+public:
+    QLock( const QString &filename, char id, bool create = FALSE );
+    ~QLock();
+    enum Type { Read, Write };
+    bool isValid() const;
+    void lock( Type type );
+    void unlock();
+    bool locked() const;
+private:
+    Type type;
+    QLockData *data;
+};
+// Nice class for ensuring the lock is released.
+// Just create one on the stack and the lock is automatically released
+// when QLockHolder is destructed.
+class QLockHolder
+{
+public:
+    QLockHolder( QLock *l, QLock::Type type ) : qlock(l) {
+        qlock->lock( type );
+    }
+    ~QLockHolder() { if ( locked() ) qlock->unlock(); }
+    void lock( QLock::Type type ) { qlock->lock( type ); }
+    void unlock() { qlock->unlock(); }
+    bool locked() const { return qlock->locked(); }
+private:
+    QLock *qlock;
+};
+#endif
diff --git a/qmake/include/private/qmousedriverinterface_p.h b/qmake/include/private/qmousedriverinterface_p.h
index fd76308..42a2e3e 100644
--- a/qmake/include/private/qmousedriverinterface_p.h
+++ b/qmake/include/private/qmousedriverinterface_p.h
@@ -27,14 +27,26 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QMOUSEDRIVERINTERFACE_H
+#ifndef QMOUSEDRIVERINTERFACE_P_H
-#define QMOUSEDRIVERINTERFACE_H
+#define QMOUSEDRIVERINTERFACE_P_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 #ifndef QT_H
 #include <private/qcom_p.h>
 #endif // QT_H
 #ifndef QT_NO_COMPONENT
@@ -50,7 +62,7 @@ struct Q_EXPORT QMouseDriverInterface : public QFeatureListInterface
 {
    virtual QWSMouseHandler* create( const QString& driver, const QString &device ) = 0;
 };
 #endif // QT_NO_COMPONENT
-#endif // QMOUSEDRIVERINTERFACE_H
+#endif // QMOUSEDRIVERINTERFACE_P_H
diff --git a/qmake/include/private/qmutexpool_p.h b/qmake/include/private/qmutexpool_p.h
index 3d9fef7..fb84157 100644
--- a/qmake/include/private/qmutexpool_p.h
+++ b/qmake/include/private/qmutexpool_p.h
@@ -1,8 +1,43 @@
-#ifndef QMUTEXPOOL_H
+/****************************************************************************
-#define QMUTEXPOOL_H
+** $Id$
+**
+** ...
+**
+** Copyright (C) 2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the tools module of the Qt GUI Toolkit.
+**
+** This file may be distributed under the terms of the Q Public License
+** as defined by Trolltech AS of Norway and appearing in the file
+** LICENSE.QPL included in the packaging of this file.
+**
+** This file may be distributed and/or modified under the terms of the
+** GNU General Public License version 2 as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL included in the
+** packaging of this file.
+**
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
+**
+** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
+** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
+**
+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+**   information about Qt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for QPL licensing information.
+** See http://www.trolltech.com/gpl/ for GPL licensing information.
+**
+** Contact info@trolltech.com if any conditions of this licensing are
+** not clear to you.
+**
+**********************************************************************/
+#ifndef QMUTEXPOOL_P_H
+#define QMUTEXPOOL_P_H
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
@@ -25,15 +60,16 @@ public:
    ~QMutexPool();
    QMutex *get( void *address );
 private:
    QMutex mutex;
-    QMemArray<QMutex*> mutexes;
+    QMutex **mutexes;
+    int count;
    bool recurs;
 };
 extern QMutexPool *qt_global_mutexpool;
 #endif // QT_THREAD_SUPPORT
-#endif // QMUTEXPOOL_H
+#endif // QMUTEXPOOL_P_H
diff --git a/qmake/include/private/qpluginmanager_p.h b/qmake/include/private/qpluginmanager_p.h
index 4b64ba0..a8da10e 100644
--- a/qmake/include/private/qpluginmanager_p.h
+++ b/qmake/include/private/qpluginmanager_p.h
@@ -1,12 +1,12 @@
 /****************************************************************************
 ** $Id$
 **
 ** Definition of QPluginManager class
 **
-** Created : 2000-01-01
+** Created : 000101
 **
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
@@ -32,18 +32,14 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QPLUGINMANAGER_H
+#ifndef QPLUGINMANAGER_P_H
-#define QPLUGINMANAGER_H
+#define QPLUGINMANAGER_P_H
-#ifndef QT_H
-#include "qgpluginmanager_p.h"
-#endif // QT_H
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
@@ -51,12 +47,16 @@
 // version to version without notice, or even be removed.
 //
 // We mean it.
 //
 //
+#ifndef QT_H
+#include "qgpluginmanager_p.h"
+#endif // QT_H
 #ifndef QT_NO_COMPONENT
 template<class Type>
 class QPluginManager : public QGPluginManager
 {
 public:
@@ -67,7 +67,7 @@ public:
        return queryUnknownInterface( feature, (QUnknownInterface**)iface );
    }
 };
 #endif //QT_NO_COMPONENT
-#endif //QPLUGINMANAGER_H
+#endif //QPLUGINMANAGER_P_H
diff --git a/qmake/include/private/qpsprinter_p.h b/qmake/include/private/qpsprinter_p.h
index 27a4968..692cb44 100644
--- a/qmake/include/private/qpsprinter_p.h
+++ b/qmake/include/private/qpsprinter_p.h
@@ -3,13 +3,13 @@
 **
 ** Definition of internal QPSPrinter class.
 ** QPSPrinter implements PostScript (tm) output via QPrinter.
 **
 ** Created : 940927
 **
-** Copyright (C) 1992-2000 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.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
@@ -58,13 +58,13 @@
 #include "qprinter.h"
 #include "qtextstream.h"
 #endif // QT_H
 #ifndef QT_NO_PRINTER
-struct QPSPrinterPrivate;
+class QPSPrinterPrivate;
 class Q_EXPORT QPSPrinter : public QPaintDevice
 {
 private:
    // QPrinter uses these
    QPSPrinter( QPrinter *, int );
diff --git a/qmake/include/private/qrichtext_p.h b/qmake/include/private/qrichtext_p.h
index 8e29804..9ed87cf 100644
--- a/qmake/include/private/qrichtext_p.h
+++ b/qmake/include/private/qrichtext_p.h
@@ -153,12 +153,14 @@ public:
 private:
    QTextStringChar &operator=( const QTextStringChar & ) {
        //abort();
        return *this;
    }
+    QTextStringChar( const QTextStringChar & ) {
+    }
    friend class QComplexText;
    friend class QTextParagraph;
 };
 #if defined(Q_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
@@ -171,14 +173,14 @@ class Q_EXPORT QTextString
 public:
    QTextString();
    QTextString( const QTextString &s );
    virtual ~QTextString();
-    static QString toString( const QMemArray<QTextStringChar> &data );
+    static QString toString( const QMemArray<QTextStringChar> &data, bool fixspaces = TRUE );
-    QString toString() const;
+    QString toString( bool fixspaces = TRUE ) const;
    QTextStringChar &at( int i ) const;
 #if defined(Q_STRICT_INLINING_RULES)
    // This is for the IRIX MIPSpro o32 ABI - it fails, claiming the
    // implementation to be a redefinition.
    inline int length() const;
@@ -283,14 +285,14 @@ public:
    void gotoLineEnd();
    void gotoLineStart();
    void gotoHome();
    void gotoEnd();
    void gotoPageUp( int visibleHeight );
    void gotoPageDown( int visibleHeight );
-    void gotoNextWord();
+    void gotoNextWord( bool onlySpace = FALSE );
-    void gotoPreviousWord();
+    void gotoPreviousWord( bool onlySpace = FALSE );
    void gotoWordLeft();
    void gotoWordRight();
    void insert( const QString &s, bool checkNewLine, QMemArray<QTextStringChar> *formatting = 0 );
    void splitAndInsertEmptyParagraph( bool ind = TRUE, bool updateIds = TRUE );
    bool remove();
@@ -323,13 +325,13 @@ public:
 private:
    enum Operation { EnterBegin, EnterEnd, Next, Prev, Up, Down };
    void push();
    void pop();
-    void processNesting( Operation op );
+    bool processNesting( Operation op );
    void invalidateNested();
    void gotoIntoNested( const QPoint &globalPos );
    QTextParagraph *para;
    int idx, tmpIndex;
    int ox, oy;
@@ -700,12 +702,13 @@ class QTextParagraph;
 #endif
 struct Q_EXPORT QTextDocumentSelection
 {
    QTextCursor startCursor, endCursor;
    bool swapped;
+    Q_DUMMY_COMPARISON_OPERATOR(QTextDocumentSelection)
 };
 #if defined(Q_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
 Q_TEMPLATE_EXTERN template class Q_EXPORT QMap<int, QColor>;
 Q_TEMPLATE_EXTERN template class Q_EXPORT QMap<int, bool>;
@@ -836,12 +839,15 @@ public:
    void setPaper( QBrush *brush ) { if ( backBrush ) delete backBrush; backBrush = brush; }
    QBrush *paper() const { return backBrush; }
    void doLayout( QPainter *p, int w );
    void draw( QPainter *p, const QRect& rect, const QColorGroup &cg, const QBrush *paper = 0 );
+    void eraseParagraphEmptyArea( QTextParagraph *parag, QPainter *p, const QColorGroup &cg );
+    bool useDoubleBuffer( QTextParagraph *parag, QPainter *p );
    void drawParagraph( QPainter *p, QTextParagraph *parag, int cx, int cy, int cw, int ch,
                    QPixmap *&doubleBuffer, const QColorGroup &cg,
                    bool drawCursor, QTextCursor *cursor, bool resetChanged = TRUE );
    QTextParagraph *draw( QPainter *p, int cx, int cy, int cw, int ch, const QColorGroup &cg,
                      bool onlyChanged = FALSE, bool drawCursor = FALSE, QTextCursor *cursor = 0,
                      bool resetChanged = TRUE );
@@ -1064,12 +1070,13 @@ private:
 // ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 struct Q_EXPORT QTextParagraphSelection
 {
    int start, end;
+    Q_DUMMY_COMPARISON_OPERATOR(QTextParagraphSelection)
 };
 struct Q_EXPORT QTextLineStart
 {
    QTextLineStart() : y( 0 ), baseLine( 0 ), h( 0 )
 #ifndef QT_NO_COMPLEXTEXT
@@ -1133,29 +1140,21 @@ class Q_EXPORT QTextParagraphData
 public:
    QTextParagraphData() {}
    virtual ~QTextParagraphData();
    virtual void join( QTextParagraphData * );
 };
-class Q_EXPORT QTextParagraphPseudoDocument
+class QTextParagraphPseudoDocument;
-{
-public:
+class QSyntaxHighlighter;
-    QTextParagraphPseudoDocument();
-    ~QTextParagraphPseudoDocument();
-    QRect docRect;
-    QTextFormatter *pFormatter;
-    QTextCommandHistory *commandHistory;
-    int minw;
-    int wused;
-};
-//nase
 class Q_EXPORT QTextParagraph
 {
    friend class QTextDocument;
    friend class QTextCursor;
+    friend class QSyntaxHighlighter;
 public:
    QTextParagraph( QTextDocument *d, QTextParagraph *pr = 0, QTextParagraph *nx = 0, bool updateIds = TRUE );
    virtual ~QTextParagraph();
    QTextString *string() const;
@@ -1173,13 +1172,19 @@ public:
    void setListDepth( int depth );
    int listDepth() const { return ldepth; }
 //     void setFormat( QTextFormat *fm );
 //     QTextFormat *paragFormat() const;
+#if defined(Q_STRICT_INLINING_RULES)
+    // This is for the IRIX MIPSpro o32 ABI - it fails, claiming the
+    // implementation to be a redefinition.
+    inline QTextDocument *document() const;
+#else
    QTextDocument *document() const;
+#endif
    QTextParagraphPseudoDocument *pseudoDocument() const;
    QRect rect() const;
    void setHeight( int h ) { r.setHeight( h ); }
    void show();
    void hide();
@@ -1593,13 +1598,12 @@ public:
    virtual QTextFormat *format( const QFont &f, const QColor &c );
    virtual void remove( QTextFormat *f );
    virtual QTextFormat *createFormat( const QTextFormat &f ) { return new QTextFormat( f ); }
    virtual QTextFormat *createFormat( const QFont &f, const QColor &c ) { return new QTextFormat( f, c, this ); }
    void updateDefaultFormat( const QFont &font, const QColor &c, QStyleSheet *sheet );
-    QDict<QTextFormat> dict() const { return cKey; }
    QPaintDevice *paintDevice() const { return paintdevice; }
    void setPaintDevice( QPaintDevice * );
 private:
    void updateKeys();
@@ -1613,12 +1617,25 @@ private:
    QString kof, knf;
    int cflags;
    QPaintDevice *paintdevice;
 };
+class Q_EXPORT QTextParagraphPseudoDocument
+{
+public:
+    QTextParagraphPseudoDocument();
+    ~QTextParagraphPseudoDocument();
+    QRect docRect;
+    QTextFormatter *pFormatter;
+    QTextCommandHistory *commandHistory;
+    int minw;
+    int wused;
+    QTextFormatCollection collection;
+};
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 inline int QTextString::length() const
 {
    return data.size();
 }
@@ -1825,12 +1842,18 @@ inline void QTextDocument::setFlow( QTextFlow *f )
 inline void QTextDocument::takeFlow()
 {
    flow_ = 0;
 }
+inline bool QTextDocument::useDoubleBuffer( QTextParagraph *parag, QPainter *p )
+{
+    return ( !parag->document()->parent() || parag->document()->nextDoubleBuffered ) &&
+        ( !p || !p->device() || p->device()->devType() != QInternal::Printer );
+}
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 inline QColor QTextFormat::color() const
 {
    return col;
 }
diff --git a/qmake/include/private/qsettings_p.h b/qmake/include/private/qsettings_p.h
index 18d118b..095291c 100644
--- a/qmake/include/private/qsettings_p.h
+++ b/qmake/include/private/qsettings_p.h
@@ -91,13 +91,13 @@ public:
    QString groupPrefix;
    bool groupDirty :1;
    bool modified :1;
    bool globalScope :1;
-#if defined(Q_WS_WIN) || defined(Q_OS_MAC)
+#if !defined(QWS) && (defined(Q_WS_WIN) || defined(Q_OS_MAC))
    // system dependent implementations to use the 
    // system specific setting database (ie. registry on Windows)
    QSettingsSysPrivate *sysd;
            voidsysInit();
            voidsysClear();
diff --git a/qmake/include/private/qsharedmemory_p.h b/qmake/include/private/qsharedmemory_p.h
index 4a8339d..927de89 100644
--- a/qmake/include/private/qsharedmemory_p.h
+++ b/qmake/include/private/qsharedmemory_p.h
@@ -2,13 +2,13 @@
 ** $Id$
 **
 ** Includes system files for shared memory
 **
 ** Created : 020124
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the kernel module of the Qt GUI Toolkit.
 **
 ** 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
@@ -27,24 +27,26 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
+#ifndef QSHAREDMEMORY_P_H
+#define QSHAREDMEMORY_P_H
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
 // of qapplication_qws.cpp and qgfxvnc_qws.cpp.  This header file may 
 // change from version to version without notice, or even be removed.
 //
+// We mean it.
+//
 //
-#if !defined(QT_QSHM_H)
-#define QT_QSHM_H
 #include <qstring.h>
 #if !defined (QT_QWS_NO_SHM)
 #include <sys/types.h>
@@ -78,7 +80,8 @@ private:
        key_t key;
        int idInitted;
 #endif
 };
 #endif
 #endif
diff --git a/qmake/include/private/qsqldriverinterface_p.h b/qmake/include/private/qsqldriverinterface_p.h
index 8957b86..8a39ddf 100644
--- a/qmake/include/private/qsqldriverinterface_p.h
+++ b/qmake/include/private/qsqldriverinterface_p.h
@@ -1,13 +1,14 @@
 /****************************************************************************
+** $Id$
 **
 ** Definition of QSqlDriverInterface class
 **
 ** Created : 2000-11-03
 **
-** Copyright (C) 2000 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.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
@@ -34,12 +35,24 @@
 **
 **********************************************************************/
 #ifndef QSQLDRIVERINTERFACE_H
 #define QSQLDRIVERINTERFACE_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 #ifndef QT_H
 #include <private/qcom_p.h>
 #endif // QT_H
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define QM_EXPORT_SQL
@@ -63,7 +76,7 @@ struct QM_EXPORT_SQL QSqlDriverFactoryInterface : public QFeatureListInterface
    virtual QSqlDriver* create( const QString& name ) = 0;
 };
 #endif //QT_NO_COMPONENT
 #endif // QT_NO_SQL
-#endif // QSQLDRIVERINTERFACE_H
+#endif // QSQLDRIVERINTERFACE_P_H
diff --git a/qmake/include/private/qsqlextension_p.h b/qmake/include/private/qsqlextension_p.h
index 597b266..3445b47 100644
--- a/qmake/include/private/qsqlextension_p.h
+++ b/qmake/include/private/qsqlextension_p.h
@@ -48,54 +48,81 @@
 // We mean it.
 //
 //
 #ifndef QT_H
 #include "qmap.h"
+#include "qvaluevector.h"
 #include "qstring.h"
 #include "qvariant.h"
+#include "qsql.h"
 #endif // QT_H
 #ifndef QT_NO_SQL
 #if !defined( QT_MODULE_SQL ) || defined( QT_LICENSE_PROFESSIONAL )
 #define QM_EXPORT_SQL
+#define QM_TEMPLATE_EXTERN_SQL
 #else
 #define QM_EXPORT_SQL Q_EXPORT
+#define QM_TEMPLATE_EXTERN_SQL Q_TEMPLATE_EXTERN
 #endif
+struct Param {
+    Param( const QVariant& v = QVariant(), QSql::ParameterType t = QSql::In ): value( v ), typ( t ) {}
+    QVariant value;
+    QSql::ParameterType typ;
+    Q_DUMMY_COMPARISON_OPERATOR(Param)
+};
+struct Holder {
+    Holder( const QString& hldr = QString::null, int pos = -1 ): holderName( hldr ), holderPos( pos ) {}
+    bool operator==( const Holder& h ) const { return h.holderPos == holderPos && h.holderName == holderName; }
+    bool operator!=( const Holder& h ) const { return h.holderPos != holderPos || h.holderName != holderName; }
+    QString holderName;
+            int    holderPos;
+};
 #if defined(Q_TEMPLATEDLL)
-Q_TEMPLATE_EXTERN template class QM_EXPORT_SQL QMap<QString,QVariant>;
+QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QMap<QString,Param>;
-Q_TEMPLATE_EXTERN template class QM_EXPORT_SQL QMap<int,QString>;
+QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QMap<int,QString>;
+QM_TEMPLATE_EXTERN_SQL template class QM_EXPORT_SQL QValueVector<Holder>;
 #endif
 class QM_EXPORT_SQL QSqlExtension {
 public:
    QSqlExtension();
    virtual ~QSqlExtension();
    virtual bool prepare( const QString& query );
    virtual bool exec();
-    virtual void bindValue( const QString& holder, const QVariant& value );
+    virtual void bindValue( const QString& holder, const QVariant& value, QSql::ParameterType = QSql::In );
-    virtual void bindValue( int pos, const QVariant& value );
+    virtual void bindValue( int pos, const QVariant& value, QSql::ParameterType = QSql::In );
-    virtual void addBindValue( const QVariant& value );
+    virtual void addBindValue( const QVariant& value, QSql::ParameterType = QSql::In );
+    virtual QVariant parameterValue( const QString& holder );
+    virtual QVariant parameterValue( int pos );
    void clearValues();
    void clearIndex();
    enum BindMethod { BindByPosition, BindByName };
    BindMethod bindMethod();
    BindMethod bindm;
    int bindCount;
    QMap<int, QString> index;
-    QMap<QString, QVariant> values;
+    typedef QMap<QString, Param> ValueMap;
+    ValueMap values;
+    // convenience container for QSqlQuery
+    // to map holders <-> positions
+    typedef QValueVector<Holder> HolderVector;
+    HolderVector holders;
 };
 class QM_EXPORT_SQL QSqlDriverExtension
 {
 public:
    QSqlDriverExtension();
    virtual ~QSqlDriverExtension();
    virtual bool isOpen() const = 0;
 };
 #endif
 #endif
diff --git a/qmake/include/private/qstyleinterface_p.h b/qmake/include/private/qstyleinterface_p.h
index 4aaedc7..24a43ad 100644
--- a/qmake/include/private/qstyleinterface_p.h
+++ b/qmake/include/private/qstyleinterface_p.h
@@ -30,14 +30,26 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QSTYLEINTERFACE_H
+#ifndef QSTYLEINTERFACE_P_H
-#define QSTYLEINTERFACE_H
+#define QSTYLEINTERFACE_P_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 #ifndef QT_H
 #include <private/qcom_p.h>
 #endif // QT_H
 #ifndef QT_NO_STYLE
@@ -55,7 +67,7 @@ struct Q_EXPORT QStyleFactoryInterface : public QFeatureListInterface
    virtual QStyle* create( const QString& style ) = 0;
 };
 #endif //QT_NO_COMPONENT
 #endif //QT_NO_STYLE
-#endif //QSTYLEINTERFACE_H
+#endif //QSTYLEINTERFACE_P_H
diff --git a/qmake/include/private/qsvgdevice_p.h b/qmake/include/private/qsvgdevice_p.h
index c1cc389..3407705 100644
--- a/qmake/include/private/qsvgdevice_p.h
+++ b/qmake/include/private/qsvgdevice_p.h
@@ -1,12 +1,12 @@
 /****************************************************************************
 ** $Id$
 **
 ** Definition of the QSvgDevice class
 **
-** Created : 20001024
+** Created : 001024
 **
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the xml module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
@@ -32,14 +32,14 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 *****************************************************************************/
-#ifndef QSVGDEVICE_H
+#ifndef QSVGDEVICE_P_H
-#define QSVGDEVICE_H
+#define QSVGDEVICE_P_H
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
@@ -128,7 +128,7 @@ inline QRect QSvgDevice::boundingRect() const
 {
    return brect;
 }
 #endif // QT_NO_SVG
-#endif // QSVGDEVICE_H
+#endif // QSVGDEVICE_P_H
diff --git a/qmake/include/private/qtextcodecinterface_p.h b/qmake/include/private/qtextcodecinterface_p.h
index d2a2cb9..76e77f7 100644
--- a/qmake/include/private/qtextcodecinterface_p.h
+++ b/qmake/include/private/qtextcodecinterface_p.h
@@ -33,13 +33,12 @@
 **
 **********************************************************************/
 #ifndef QTEXTCODECINTERFACE_P_H
 #define QTEXTCODECINTERFACE_P_H
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
 // of qpsprinter.cpp and qprinter_x11.cpp.
@@ -47,13 +46,12 @@
 // or even be removed.
 //
 // We mean it.
 //
 //
 #ifndef QT_H
 #include <private/qcom_p.h>
 #endif // QT_H
 #ifndef QT_NO_TEXTCODEC
 #ifndef QT_NO_COMPONENT
diff --git a/qmake/include/private/qtitlebar_p.h b/qmake/include/private/qtitlebar_p.h
index dabb6bf..091845f 100644
--- a/qmake/include/private/qtitlebar_p.h
+++ b/qmake/include/private/qtitlebar_p.h
@@ -1,12 +1,12 @@
 /****************************************************************************
 ** $Id$
 **
 ** Definition of some Qt private functions.
 **
-** Created : 2000-01-01
+** Created : 000101
 **
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the widgets module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
diff --git a/qmake/include/private/qucom_p.h b/qmake/include/private/qucom_p.h
index d2ff48e..6b6ad40 100644
--- a/qmake/include/private/qucom_p.h
+++ b/qmake/include/private/qucom_p.h
@@ -32,19 +32,14 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QUCOM_H
+#ifndef QUCOM_P_H
-#define QUCOM_H
+#define QUCOM_P_H
-#ifndef QT_H
-#include <qstring.h>
-#include "quuid.h"
-#endif // QT_H
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
@@ -52,12 +47,17 @@
 // version to version without notice, or even be removed.
 //
 // We mean it.
 //
 //
+#ifndef QT_H
+#include <qstring.h>
+#include "quuid.h"
+#endif // QT_H
 #ifdef check
 #undef check
 #endif
 struct QUObject;
 struct QUInterfaceDescription;
@@ -126,58 +126,58 @@ public: // scary MSVC bug makes this necessary
    QUType *type;
    // the unavoidable union
    union
    {
        bool b;
-        
        char c;
        short s;
        int i;
        long l;
-        
        unsigned char uc;
        unsigned short us;
        unsigned int ui;
        unsigned long ul;
-        
        float f;
        double d;
-        
        char byte[16];
-        
        struct {
           char* data;
           unsigned long size;
        } bytearray;
-        
        void* ptr;
-        
        struct {
            void *ptr;
            bool owner;
        } voidstar;
-        
        struct {
            char *ptr;
            bool owner;
        } charstar;
        struct {
            char *ptr;
            bool owner;
        } utf8;
-        
        struct {
            char *ptr;
            bool owner;
        } local8bit;
-        
        QUnknownInterface* iface;
        QDispatchInterface* idisp;
-        
    } payload;
 };
 // A parameter description describes one method parameters. A
@@ -260,13 +260,13 @@ struct Q_EXPORT QUEnumItem 				// - a name/value pair
 {
    const char *key;
    int value;
 };
 struct Q_EXPORT QUEnum
-        {               
+{
            const char *name;           // - enumerator name
            unsigned int count;                 // - number of values
            const QUEnumItem *items;    // - the name/value pairs
            bool set;                   // whether enum has to be treated as a set
 };
@@ -393,30 +393,12 @@ struct Q_EXPORT QUType_int : public QUType
    void clear( QUObject * ) {}
    int serializeTo( QUObject *, QUBuffer * );
    int serializeFrom( QUObject *, QUBuffer * );
 };
 extern Q_EXPORT QUType_int static_QUType_int;
-// {5938712A-C496-11D5-8CB2-00C0F03BC0F3}
-extern Q_EXPORT const QUuid TID_QUType_uint;
-struct Q_EXPORT QUType_uint : public QUType
-{
-    const QUuid *uuid() const;
-    const char *desc() const;
-    void set( QUObject *, uint );
-    uint &get( QUObject *o ) { return o->payload.ui; }
-    bool canConvertFrom( QUObject *, QUType * );
-    bool canConvertTo( QUObject *, QUType * );
-    bool convertFrom( QUObject *, QUType * );
-    bool convertTo( QUObject *, QUType * );
-    void clear( QUObject * ) {}
-    int serializeTo( QUObject *, QUBuffer * );
-    int serializeFrom( QUObject *, QUBuffer * );
-};
-extern Q_EXPORT QUType_uint static_QUType_uint;
 // {2D0974E5-0BA6-4ec2-8837-C198972CB48C}
 extern Q_EXPORT const QUuid TID_QUType_double;
 struct Q_EXPORT QUType_double : public QUType
 {
    const QUuid *uuid() const;
@@ -431,30 +413,12 @@ struct Q_EXPORT QUType_double : public QUType
    void clear( QUObject * ) {}
    int serializeTo( QUObject *, QUBuffer * );
    int serializeFrom( QUObject *, QUBuffer * );
 };
 extern Q_EXPORT QUType_double static_QUType_double;
-// {544C5175-6993-4486-B04D-CEC4D21BF4B9 }
-extern Q_EXPORT const QUuid TID_QUType_float;
-struct Q_EXPORT QUType_float : public QUType
-{
-    const QUuid *uuid() const;
-    const char *desc() const;
-    void set( QUObject *, float );
-    float &get( QUObject *o ) { return o->payload.f; }
-    bool canConvertFrom( QUObject *, QUType * );
-    bool canConvertTo( QUObject *, QUType * );
-    bool convertFrom( QUObject *, QUType * );
-    bool convertTo( QUObject *, QUType * );
-    void clear( QUObject * ) {}
-    int serializeTo( QUObject *, QUBuffer * );
-    int serializeFrom( QUObject *, QUBuffer * );
-};
-extern Q_EXPORT QUType_float static_QUType_float;
 // {EFCDD1D4-77A3-4b8e-8D46-DC14B8D393E9}
 extern Q_EXPORT const QUuid TID_QUType_charstar;
 struct Q_EXPORT QUType_charstar : public QUType
 {
    const QUuid *uuid() const;
@@ -493,7 +457,7 @@ struct Q_EXPORT QUType_QString : public QUType
    int serializeFrom( QUObject *, QUBuffer * );
 };
 extern Q_EXPORT QUType_QString static_QUType_QString;
-#endif // QUCOM_H
+#endif // QUCOM_P_H
diff --git a/qmake/include/private/qucomextra_p.h b/qmake/include/private/qucomextra_p.h
index 3de6104..fe39692 100644
--- a/qmake/include/private/qucomextra_p.h
+++ b/qmake/include/private/qucomextra_p.h
@@ -32,14 +32,26 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QUCOMEXTRA_H
+#ifndef QUCOMEXTRA_P_H
-#define QUCOMEXTRA_H
+#define QUCOMEXTRA_P_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 #ifndef QT_H
 #include <private/qucom_p.h>
 #endif // QT_H
@@ -86,8 +98,8 @@ struct Q_EXPORT QUType_varptr : public QUType
    int serializeTo( QUObject *, QUBuffer * );
    int serializeFrom( QUObject *, QUBuffer * );
 };
 extern Q_EXPORT QUType_varptr static_QUType_varptr;
-#endif // QUCOMEXTRA_H
+#endif // QUCOMEXTRA_P_H
diff --git a/qmake/include/private/qwidgetinterface_p.h b/qmake/include/private/qwidgetinterface_p.h
index 5b5776b..78e9aad 100644
--- a/qmake/include/private/qwidgetinterface_p.h
+++ b/qmake/include/private/qwidgetinterface_p.h
@@ -1,36 +1,43 @@
- /**********************************************************************
+/****************************************************************************
-** Copyright (C) 2000-2001 Trolltech AS.  All rights reserved.
+** $Id$
 **
-** This file is part of Qt Designer.
+** ...
+**
+** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
+**
+** This file is part of the widgets module of the Qt GUI Toolkit.
+**
+** This file may be distributed under the terms of the Q Public License
+** as defined by Trolltech AS of Norway and appearing in the file
+** LICENSE.QPL included in the packaging of this file.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** Licensees holding valid Qt Enterprise Edition or Qt Professional Edition
+** licenses may use this file in accordance with the Qt Commercial License
+** Agreement provided with the Software.
+**
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
+** See http://www.trolltech.com/pricing.html or email sales@trolltech.com for
+**   information about Qt Commercial License Agreements.
+** See http://www.trolltech.com/qpl/ for QPL licensing information.
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QWIDGETINTERFACE_H
+#ifndef QWIDGETINTERFACE_P_H
-#define QWIDGETINTERFACE_H
+#define QWIDGETINTERFACE_P_H
-#ifndef QT_H
-#include <private/qcom_p.h>
-#include <qiconset.h>
-#endif // QT_H
-#ifndef QT_NO_WIDGETPLUGIN
 //
 //  W A R N I N G
 //  -------------
 //
 // This file is not part of the Qt API.  It exists for the convenience
@@ -38,12 +45,19 @@
 // version to version without notice, or even be removed.
 //
 // We mean it.
 //
 //
+#ifndef QT_H
+#include <private/qcom_p.h>
+#include <qiconset.h>
+#endif // QT_H
+#ifndef QT_NO_WIDGETPLUGIN
 class QWidget;
 // {55184143-f18f-42c0-a8eb-71c01516019a}
 #ifndef IID_QWidgetFactory
 #define IID_QWidgetFactory QUuid( 0x55184143, 0xf18f, 0x42c0, 0xa8, 0xeb, 0x71, 0xc0, 0x15, 0x16, 0x1, 0x9a )
 #endif
@@ -89,23 +103,38 @@ public:
    /*! In the implementation return TRUE here, of the \a widget
      should be able to contain other widget in the Qt Designer, else
      FALSE. */
    virtual bool isContainer( const QString &widget ) const = 0;
 };
-#if CONTAINER_CUSTOM_WIDGETS
+#ifdef QT_CONTAINER_CUSTOM_WIDGETS
 // {15976628-e3c3-47f4-b525-d124a3caf30e}
 #ifndef IID_QWidgetContainer
 #define IID_QWidgetContainer QUuid( 0x15976628, 0xe3c3, 0x47f4, 0xb5, 0x25, 0xd1, 0x24, 0xa3, 0xca, 0xf3, 0x0e )
 #endif
 struct QWidgetContainerInterfacePrivate : public QUnknownInterface
 {
 public:
-    virtual QWidget *containerOfWidget( QWidget *widget ) const = 0;
+    virtual QWidget *containerOfWidget( const QString &f, QWidget *container ) const = 0;
-    virtual QWidgetList containersOf( QWidget *widget ) const = 0;
+    virtual bool isPassiveInteractor( const QString &f, QWidget *container ) const = 0;
-    virtual bool isPassiveInteractor( QWidget *widget ) const = 0;
+    virtual bool supportsPages( const QString &f ) const = 0;
+    virtual QWidget *addPage( const QString &f, QWidget *container,
+                              const QString &name, int index ) const = 0;
+    virtual void insertPage( const QString &f, QWidget *container,
+                             const QString &name, int index, QWidget *page ) const = 0;
+    virtual void removePage( const QString &f, QWidget *container, int index ) const = 0;
+    virtual void movePage( const QString &f, QWidget *container, int fromIndex, int toIndex ) const = 0;
+    virtual int count( const QString &key, QWidget *container ) const = 0;
+    virtual int currentIndex( const QString &key, QWidget *container ) const = 0;
+    virtual QString pageLabel( const QString &key, QWidget *container, int index ) const = 0;
+    virtual QWidget *page( const QString &key, QWidget *container, int index ) const = 0;
+    virtual void renamePage( const QString &key, QWidget *container,
+                             int index, const QString &newName ) const = 0;
+    virtual QWidgetList pages( const QString &f, QWidget *container ) const = 0;
 };
 #endif
 #endif // QT_NO_WIDGETPLUGIN
-#endif // QWIDGETINTERFACE_H
+#endif // QWIDGETINTERFACE_P_H
diff --git a/qmake/include/private/qwidgetresizehandler_p.h b/qmake/include/private/qwidgetresizehandler_p.h
index ca229db..9297832 100644
--- a/qmake/include/private/qwidgetresizehandler_p.h
+++ b/qmake/include/private/qwidgetresizehandler_p.h
@@ -2,13 +2,13 @@
 ** $Id$
 **
 ** Definition of the QWidgetResizeHandler class
 **
 ** Created : 001010
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the workspace module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
@@ -32,14 +32,26 @@
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#ifndef QWIDGETRESIZEHANDLER_H
+#ifndef QWIDGETRESIZEHANDLER_P_H
-#define QWIDGETRESIZEHANDLER_H
+#define QWIDGETRESIZEHANDLER_P_H
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  This header file may
+// change from version to version without notice, or even be
+// removed.
+//
+// We mean it.
+//
+//
 #ifndef QT_H
 #include "qobject.h"
 #endif // QT_H
 #ifndef QT_NO_RESIZEHANDLER
 class QMouseEvent;
diff --git a/qmake/include/qasciidict.h b/qmake/include/qasciidict.h
index 8f344cd..ecd9c9f 100644
--- a/qmake/include/qasciidict.h
+++ b/qmake/include/qasciidict.h
@@ -112,7 +112,11 @@ public:
    const char *currentKey() const { return QGDictIterator::getKeyAscii(); }
            type *operator()()      { return (type *)QGDictIterator::operator()(); }
            type *operator++()      { return (type *)QGDictIterator::operator++(); }
    type *operator+=(uint j)  { return (type *)QGDictIterator::operator+=(j);}
 };
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QASCIIDICT
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QASCIIDICT_H
diff --git a/qmake/include/qcstring.h b/qmake/include/qcstring.h
index 004bb3b..6b7352a 100644
--- a/qmake/include/qcstring.h
+++ b/qmake/include/qcstring.h
@@ -98,15 +98,17 @@ Q_EXPORT inline int cstrncmp( const char *str1, const char *str2, uint len )
 Q_EXPORT Q_UINT16 qChecksum( const char *s, uint len );
 /*****************************************************************************
  QByteArray class
 *****************************************************************************/
+#ifndef QT_QWINEXPORT
 #if defined(Q_TEMPLATEDLL)
 Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<char>;
 #endif
+#endif /* QT_QWINEXPORT */
 #if defined(Q_QDOC)
 /*
  We want qdoc to document QByteArray as a real class that inherits
  QMemArray<char> and that is inherited by QBitArray.
 */
@@ -229,12 +231,14 @@ public:
            boolsetExpand( uint index, char c );
                operator const char *() const;
    QCString    &operator+=( const char *str );
    QCString    &operator+=( char c );
+private:
+            intfind( const char *str, int index, bool cs, uint l ) const;
 };
 /*****************************************************************************
  QCString stream functions
 *****************************************************************************/
@@ -385,7 +389,10 @@ Q_EXPORT inline const QCString operator+( char c1, const QCString &s2 )
    QCString tmp;
    tmp += c1;
    tmp += s2;
    return tmp;
 }
+#ifdef QT_QWINEXPORT
+#include <qwinexport.h>
+#endif /* QT_QWINEXPORT */
 #endif // QCSTRING_H
diff --git a/qmake/include/qdict.h b/qmake/include/qdict.h
index 04ae7bf..d8943ad 100644
--- a/qmake/include/qdict.h
+++ b/qmake/include/qdict.h
@@ -112,7 +112,11 @@ public:
    QString currentKey() const{ return QGDictIterator::getKeyString(); }
            type *operator()()      { return (type *)QGDictIterator::operator()(); }
            type *operator++()      { return (type *)QGDictIterator::operator++(); }
    type *operator+=(uint j)  { return (type *)QGDictIterator::operator+=(j); }
 };
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QDICT
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QDICT_H
diff --git a/qmake/include/qdir.h b/qmake/include/qdir.h
index 6e9f1ab..4b08b79 100644
--- a/qmake/include/qdir.h
+++ b/qmake/include/qdir.h
@@ -175,23 +175,24 @@ public:
    static QString rootDirPath();
    static bool match( const QStringList &filters, const QString &fileName );
    static bool match( const QString &filter, const QString &fileName );
    static QString cleanDirPath( const QString &dirPath );
    static bool isRelativePath( const QString &path );
+    void refresh() const;
 private:
 #ifdef Q_OS_MAC
    typedef struct FSSpec FSSpec;
    static FSSpec *make_spec(const QString &);
 #endif
    void init();
    virtual bool readDirEntries( const QString &nameFilter,
                                 int FilterSpec, int SortSpec  );
-    static void slashify ( QString &);
+    static void slashify( QString & );
            QStringdPath;
    QStringList   *fList;
    QFileInfoList *fiList;
            QStringnameFilt;
            FilterSpecfiltS;
diff --git a/qmake/include/qfeatures.h b/qmake/include/qfeatures.h
index 57502f9..270a6de 100644
--- a/qmake/include/qfeatures.h
+++ b/qmake/include/qfeatures.h
@@ -71,13 +71,13 @@
 // 24-bit color
 //#define QT_NO_QWS_DEPTH_24
 // 32-bit color
 //#define QT_NO_QWS_DEPTH_32
-// 4-bit greyscale
+// 4-bit grayscale
 //#define QT_NO_QWS_DEPTH_4
 // 8-bit color
 //#define QT_NO_QWS_DEPTH_8
 // 8-bit grayscale
diff --git a/qmake/include/qgarray.h b/qmake/include/qgarray.h
index 12edea6..40720a6 100644
--- a/qmake/include/qgarray.h
+++ b/qmake/include/qgarray.h
@@ -46,17 +46,25 @@
        class Q_EXPORT QGArray                          // generic array
 {
 friend class QBuffer;
 public:
    //### DO NOT USE THIS.  IT IS PUBLIC BUT DO NOT USE IT IN NEW CODE.
            struct array_data : public QShared {// shared array
-                array_data(){ data=0; len=0; }
+        array_data():data(0),len(0)
+#ifdef QT_QGARRAY_SPEED_OPTIM
+                    ,maxl(0)
+#endif
+            {}
                char *data;                     // actual array data
        uint  len;
+#ifdef QT_QGARRAY_SPEED_OPTIM
+        uint maxl;
+#endif
    };
    QGArray();
+    enum Optimization { MemOptim, SpeedOptim };
 protected:
            QGArray( int, int );                // dummy; does not alloc
            QGArray( int size );                // allocate 'size' bytes
            QGArray( const QGArray &a );        // shallow copy
    virtual ~QGArray();
@@ -67,12 +75,13 @@ protected:
    // ### Qt 4.0: maybe provide two versions of data(), at(), etc.
            char       *data()   const{ return shd->data; }
            uint        nrefs()          const{ return shd->count; }
            uint        size()   const{ return shd->len; }
            boolisEqual( const QGArray &a ) const;
+            boolresize( uint newsize, Optimization optim );
            boolresize( uint newsize );
            boolfill( const char *d, int len, uint sz );
    QGArray    &assign( const QGArray &a );
    QGArray    &assign( const char *d, uint len );
@@ -85,13 +94,13 @@ protected:
    QGArray    &setRawData( const char *d, uint len );
            voidresetRawData( const char *d, uint len );
            int         find( const char *d, uint index, uint sz ) const;
            int         contains( const char *d, uint sz ) const;
-    
            voidsort( uint sz );
            int         bsearch( const char *d, uint sz ) const;
    char       *at( uint index ) const;
            boolsetExpand( uint index, const char *d, uint sz );
diff --git a/qmake/include/qglobal.h b/qmake/include/qglobal.h
index 13cff64..d212bff 100644
--- a/qmake/include/qglobal.h
+++ b/qmake/include/qglobal.h
@@ -35,17 +35,17 @@
 **
 **********************************************************************/
 #ifndef QGLOBAL_H
 #define QGLOBAL_H
-#define QT_VERSION_STR   "3.1.0-b2"
+#define QT_VERSION_STR   "3.1.2"
 /*
   QT_VERSION is (major << 16) + (minor << 8) + patch.
 */
-#define QT_VERSION 0x030100
+#define QT_VERSION 0x030102
 /*
   The operating system, must be one of: (Q_OS_x)
             MACX- Mac OS X
             MAC9- Mac OS 9
@@ -138,18 +138,18 @@
 #elif defined(__QNXNTO__)
 #  define Q_OS_QNX6
 #elif defined(__QNX__)
 #  define Q_OS_QNX
 #elif defined(_SEQUENT_)
 #  define Q_OS_DYNIX
-#elif defined(_SCO_DS)      /* SCO OpenServer 5 */
+#elif defined(_SCO_DS)                   /* SCO OpenServer 5 + GCC */
 #  define Q_OS_SCO
-#elif defined(__UNIXWARE__) /* UnixWare 7 + GCC, Open UNIX 8 + GCC */
+#elif defined(__USLC__)                  /* all SCO platforms + UDK or OUDK */
 #  define Q_OS_UNIXWARE
 #  define Q_OS_UNIXWARE7
-#elif defined(__USLC__)     /* UnixWare 7 + UDK, Open UNIX 8 + OUDK */
+#elif defined(__svr4__) && defined(i386) /* Open UNIX 8 + GCC */
 #  define Q_OS_UNIXWARE
 #  define Q_OS_UNIXWARE7
 #else
 #  error "Qt has not been ported to this OS - talk to qt-bugs@trolltech.com"
 #endif
@@ -222,13 +222,15 @@
 /* proper support of bool for _MSC_VER >= 1100 */
 #  define Q_CANNOT_DELETE_CONSTANT
 #  define Q_INLINE_TEMPLATES inline
 /* Visual C++.Net issues for _MSC_VER >= 1300 */
 #  if _MSC_VER >= 1300
 #    define Q_CC_MSVC_NET
-#    define Q_TYPENAME
+#    if _MSC_VER < 1310
+#      define Q_TYPENAME
+#    endif
 #  endif
 #  define Q_NO_USING_KEYWORD /* ### check "using" status */
 #elif defined(__BORLANDC__) || defined(__TURBOC__)
 #  define Q_CC_BOR
 #  if __BORLANDC__ < 0x502
@@ -268,12 +270,16 @@
 #    define Q_FULL_TEMPLATE_INSTANTIATION
 #  endif
 /* GCC 2.95 knows "using" but does not support it correctly */
 #  if __GNUC__ == 2 && __GNUC_MINOR__ <= 95
 #    define Q_NO_USING_KEYWORD
 #  endif
+/* GCC 3.1 and GCC 3.2 wrongly define _SB_CTYPE_MACROS on HP-UX */
+#  if defined(Q_OS_HPUX) && __GNUC__ == 3 && __GNUC_MINOR__ >= 1
+#    define Q_WRONG_SB_CTYPE_MACROS
+#  endif
 #  if (defined(__arm__) || defined(__ARMEL__)) && !defined(QT_MOC_CPP)
 #    define Q_PACKED __attribute__ ((packed))
 #  endif
 #  if !defined(__EXCEPTIONS)
 #    define Q_NO_EXCEPTIONS
 #  endif
@@ -387,22 +393,25 @@
 #  elif defined(__ghs)
 #    define Q_CC_GHS
 /* The UnixWare 7 UDK compiler is based on EDG and does define __EDG__ */
 #  elif defined(__USLC__) && defined(__SCO_VERSION__)
 #    define Q_CC_USLC
+/* The latest UDK 7.1.1b does not need this, but previous versions do */
+#    if !defined(__SCO_VERSION__) || (__SCO_VERSION__ < 302200010)
+#      define Q_INLINE_TEMPLATES inline
+#    endif
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
 /* Never tested! */
 #  elif defined(CENTERLINE_CLPP) || defined(OBJECTCENTER)
 #    define Q_CC_OC
 #    define Q_NO_USING_KEYWORD
-/* CDS++ is not documented to define __EDG__ or __EDG in the Reliant
+/* CDS++ defines __EDG__ although this is not documented in the Reliant
-   documentation but we suppose it does, in any case it does follow
+   documentation. It also follows conventions like _BOOL and this documented */
-   conventions like _BOOL */
 #  elif defined(sinix)
 #    define Q_CC_CDS
 #    define Q_NO_USING_KEYWORD
 #    if defined(__cplusplus) && (__cplusplus < 2) /* Cfront C++ mode */
 #      define Q_NO_EXCEPTIONS
 #    endif
@@ -412,25 +421,29 @@
 #  elif defined(__sgi)
 #    define Q_CC_MIPS
 #    if defined(_MIPS_SIM) && (_MIPS_SIM == _ABIO32) /* o32 ABI */
 #      define Q_TYPENAME
 #      define Q_BROKEN_TEMPLATE_SPECIALIZATION
 #      define Q_STRICT_INLINING_RULES
+#      define Q_NO_EXPLICIT_KEYWORD
+#      define Q_INLINE_TEMPLATES inline
 #    elif defined(_COMPILER_VERSION) && (_COMPILER_VERSION < 730) /* 7.2 */
 #      define Q_TYPENAME
 #      define Q_BROKEN_TEMPLATE_SPECIALIZATION
 #    endif
 #    define Q_NO_USING_KEYWORD /* ### check "using" status */
 #  endif
 /* The older UnixWare 2.X compiler? */
-#elif defined(__USLC__) && !defined(__SCO_VERSION__)
+#elif defined(__USLC__)
 #  define Q_CC_USLC
+#  define Q_TYPENAME
 #  define Q_NO_BOOL_TYPE
 #  define Q_NO_EXPLICIT_KEYWORD
 #  define Q_NO_USING_KEYWORD
+#  define Q_INLINE_TEMPLATES inline
 /* Never tested! */
 #elif defined(__HIGHC__)
 #  define Q_CC_HIGHC
 #elif defined(__SUNPRO_CC)
@@ -451,12 +464,22 @@
 #  else
 #    define Q_NO_BOOL_TYPE
 #    define Q_NO_EXPLICIT_KEYWORD
 #    define Q_NO_USING_KEYWORD
 #  endif
+/* CDS++ does not seem to define __EDG__ or __EDG according to Reliant
+   documentation but nevertheless uses EDG conventions like _BOOL */
+#elif defined(sinix)
+#  define Q_CC_EDG
+#  define Q_CC_CDS
+#  if !defined(_BOOL)
+#    define Q_NO_BOOL_TYPE
+#  endif
+#  define Q_BROKEN_TEMPLATE_SPECIALIZATION
 #elif defined(Q_OS_HPUX)
 /* __HP_aCC was not defined in first aCC releases */
 #  if defined(__HP_aCC) || __cplusplus >= 199707L
 #    define Q_CC_HPACC
 #  else
 #    define Q_CC_HP
@@ -503,12 +526,13 @@
 #elif defined(Q_OS_OS2)
 #  define Q_WS_PM
 #  error "Qt does not work with OS/2 Presentation Manager or Workplace Shell"
 #elif defined(Q_OS_UNIX)
 #  if defined(QWS)
 #    define Q_WS_QWS
+#    define QT_NO_QWS_IM
 #  elif defined(Q_OS_MACX)
 #    define Q_WS_MACX
 #  else
 #    define Q_WS_X11
 #  endif
 #endif
@@ -742,19 +766,24 @@ class QDataStream;
 #  endif
 #  ifndef QMAC_QMENUBAR_NO_EVENT
 #    define QMAC_QMENUBAR_NO_EVENT
 #  endif
 #endif
+#if !defined(Q_WS_QWS) && !defined(QT_NO_COP)
+#  define QT_NO_COP
+#endif
 #ifndef QT_H
 #include <qfeatures.h>
 #endif // QT_H
 //
 // Create Qt DLL if QT_DLL is defined (Windows only)
+// or QT_SHARED is defined (Kylix only)
 //
 #if defined(Q_OS_WIN32) || defined(Q_OS_WIN64)
 #  if defined(QT_NODLL)
 #    undef QT_MAKEDLL
 #    undef QT_DLL
@@ -767,19 +796,30 @@ class QDataStream;
 #    define Q_TEMPLATE_EXTERN
        #    undef  Q_DISABLE_COPY/* avoid unresolved externals */
        #  elif defined(QT_DLL)         /* use a Qt DLL library */
 #    define Q_EXPORT  __declspec(dllimport)
 #    define Q_TEMPLATEDLL
 #    ifndef Q_TEMPLATE_EXTERN
-#      if defined(Q_CC_MSVC)
+#      if defined(Q_CC_MSVC_NET)
-#        define Q_TEMPLATE_EXTERN /*extern*/ //### too many warnings, even though disabled
+#        define Q_TEMPLATE_EXTERN extern
 #      else
 #        define Q_TEMPLATE_EXTERN
 #      endif
 #    endif
-#    undef  Q_DISABLE_COPY  /* avoid unresolved externals */
+        #    undef  Q_DISABLE_COPY/* avoid unresolved externals */
+#  endif
+#elif defined(Q_OS_LINUX) && defined(Q_CC_BOR)
+        #  if defined(QT_SHARED)/* create a Qt shared library */
+#    define Q_EXPORT  __declspec(dllexport)
+#    define Q_TEMPLATEDLL
+#    define Q_TEMPLATE_EXTERN
+        #    undef  Q_DISABLE_COPY/* avoid unresolved externals */
+#  else
+#    define Q_TEMPLATEDLL
+#    define Q_TEMPLATE_EXTERN
+        #    undef  Q_DISABLE_COPY /* avoid unresolved externals */
 #  endif
 #else
        #  undef QT_MAKEDLL     /* ignore these for other platforms */
 #  undef QT_DLL
 #endif
@@ -800,13 +840,15 @@ extern Q_EXPORT bool qt_winunicode;
 //
 // System information
 //
 Q_EXPORT const char *qVersion();
 Q_EXPORT bool qSysInfo( int *wordSize, bool *bigEndian );
-#if defined(Q_WS_WIN)
+#if defined(Q_OS_MAC)
+int qMacVersion();
+#elif defined(Q_WS_WIN)
 Q_EXPORT int qWinVersion();
 #if defined(UNICODE)
 #define QT_WA( uni, ansi ) if ( qt_winunicode ) { uni } else { ansi }
 #define QT_WA_INLINE( uni, ansi ) ( qt_winunicode ? uni : ansi )
 #else
 #define QT_WA( uni, ansi ) ansi
@@ -966,12 +1008,28 @@ Q_EXPORT const char *qInstallPathLibs();
 Q_EXPORT const char *qInstallPathBins();
 Q_EXPORT const char *qInstallPathPlugins();
 Q_EXPORT const char *qInstallPathData();
 #endif // __cplusplus
+// compilers which follow outdated template instantiation rules
+// require a class to have a comparison operator to exist when
+// a QValueList of this type is instantiated. It's not actually
+// used in the list, though. Hence the dummy implementation.
+// Just in case other code relies on it we better trigger a warning
+// mandating a real implementation.
+#ifdef Q_FULL_TEMPLATE_INSTANTIATION
+#  define Q_DUMMY_COMPARISON_OPERATOR(C) \
+    bool operator==( const C& ) const { \
+        qWarning( #C"::operator==( const "#C"& ) got called." ); \
+        return FALSE; \
+    }
+#else
+#  define Q_DUMMY_COMPARISON_OPERATOR(C)
+#endif
 #endif // QGLOBAL_H
 //
 // Avoid some particularly useless warnings from some stupid compilers.
 // To get ALL C++ compiler warnings, define QT_CC_WARNINGS or comment out
 // the line "#define QT_NO_WARNINGS"
@@ -989,12 +1047,13 @@ Q_EXPORT const char *qInstallPathData();
 #    pragma warning(disable: 4097) // typedef-name 'identifier1' used as synonym for class-name 'identifier2'
 #    pragma warning(disable: 4706) // assignment within conditional expression
 #    pragma warning(disable: 4786) // truncating debug info after 255 characters
 #    pragma warning(disable: 4660) // template-class specialization 'identifier' is already instantiated
 #    pragma warning(disable: 4355) // 'this' : used in base member initializer list
 #    pragma warning(disable: 4231) // nonstandard extension used : 'extern' before template explicit instantiation
+#    pragma warning(disable: 4710) // function not inlined
 #  elif defined(Q_CC_BOR)
 #    pragma option -w-inl
 #    pragma option -w-aus
 #    pragma warn -inl
 #    pragma warn -pia
 #    pragma warn -ccc
diff --git a/qmake/include/qintdict.h b/qmake/include/qintdict.h
index b4cb223..0299879 100644
--- a/qmake/include/qintdict.h
+++ b/qmake/include/qintdict.h
@@ -108,7 +108,11 @@ public:
    long  currentKey() const  { return QGDictIterator::getKeyInt(); }
            type *operator()()      { return (type *)QGDictIterator::operator()(); }
            type *operator++()      { return (type *)QGDictIterator::operator++(); }
    type *operator+=(uint j)  { return (type *)QGDictIterator::operator+=(j);}
 };
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QINTDICT
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QINTDICT_H
diff --git a/qmake/include/qmap.h b/qmake/include/qmap.h
index 269bd6b..4bc0a2f 100644
--- a/qmake/include/qmap.h
+++ b/qmake/include/qmap.h
@@ -877,7 +877,11 @@ Q_INLINE_TEMPLATES QDataStream& operator<<( QDataStream& s, const QMap<Key,T>& m
    for( ; it != m.end(); ++it )
        s << it.key() << it.data();
    return s;
 }
 #endif
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QMAP
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QMAP_H
diff --git a/qmake/include/qmemarray.h b/qmake/include/qmemarray.h
index a5baf99..267670d 100644
--- a/qmake/include/qmemarray.h
+++ b/qmake/include/qmemarray.h
@@ -40,13 +40,13 @@
 #ifndef QT_H
 #include "qgarray.h"
 #endif // QT_H
-template<class type> 
+template<class type>
 class QMemArray : public QGArray
 {
 public:
    typedef type* Iterator;
    typedef const type* ConstIterator;
    typedef type ValueType;
@@ -65,12 +65,13 @@ public:
            uint  nrefs()   const{ return QGArray::nrefs(); }
            uint  size()    const{ return QGArray::size()/sizeof(type); }
            uint  count()   const{ return size(); }
            bool  isEmpty() const{ return QGArray::size() == 0; }
            bool  isNull()  const{ return QGArray::data() == 0; }
            bool  resize( uint size ){ return QGArray::resize(size*sizeof(type)); }
+    bool  resize( uint size, Optimization optim ) { return QGArray::resize(size*sizeof(type), optim); }
            bool  truncate( uint pos ){ return QGArray::resize(pos*sizeof(type)); }
    bool  fill( const type &d, int size = -1 )
        { return QGArray::fill((char*)&d,size,sizeof(type) ); }
            void  detach()      { QGArray::detach(); }
    QMemArray<type>   copy() const
        { QMemArray<type> tmp; return tmp.duplicate(*this); }
@@ -105,18 +106,24 @@ public:
    Iterator begin() { return data(); }
    Iterator end() { return data() + size(); }
    ConstIterator begin() const { return data(); }
    ConstIterator end() const { return data() + size(); }
 };
+#ifndef QT_QWINEXPORT
 #if defined(Q_TEMPLATEDLL)
 // MOC_SKIP_BEGIN
 Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<int>;
 Q_TEMPLATE_EXTERN template class Q_EXPORT QMemArray<bool>;
 // MOC_SKIP_END
 #endif
+#endif /* QT_QWINEXPORT */
 #ifndef QT_NO_COMPAT
 #define QArray QMemArray
 #endif
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QMEMARRAY
+#include <qwinexport.h>
+#endif /* QT_QWINEXPORT */
 #endif // QARRAY_H
diff --git a/qmake/include/qptrlist.h b/qmake/include/qptrlist.h
index 53fb605..17b5ee9 100644
--- a/qmake/include/qptrlist.h
+++ b/qmake/include/qptrlist.h
@@ -1,13 +1,11 @@
 /****************************************************************************
 ** $Id$
 **
 ** Definition of QPtrList template/macro class
 **
-** Created :
-**
 ** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
@@ -154,7 +152,11 @@ public:
 #ifndef QT_NO_COMPAT
 #define QList QPtrList
 #define QListIterator QPtrListIterator
 #endif
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QPTRLIST
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QPTRLIST_H
diff --git a/qmake/include/qptrvector.h b/qmake/include/qptrvector.h
index f6d9623..49b40b7 100644
--- a/qmake/include/qptrvector.h
+++ b/qmake/include/qptrvector.h
@@ -107,7 +107,11 @@ template<class type> inline void QPtrVector<type>::deleteItem( QPtrCollection::I
 }
 #ifndef QT_NO_COMPAT
 #define QVector QPtrVector
 #endif
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QPTRVECTOR
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QVECTOR_H
diff --git a/qmake/include/qregexp.h b/qmake/include/qregexp.h
index 7bb777a..90f54bd 100644
--- a/qmake/include/qregexp.h
+++ b/qmake/include/qregexp.h
@@ -77,13 +77,13 @@ public:
    bool exactMatch( const QString& str ) const;
 #ifndef QT_NO_COMPAT
    int match( const QString& str, int index = 0, int *len = 0,
               bool indexIsStart = TRUE ) const;
 #endif
-#if defined(qdoc)
+#if defined(Q_QDOC)
    int search( const QString& str, int offset = 0,
                CaretMode caretMode = CaretAtZero ) const;
    int searchRev( const QString& str, int offset = -1,
                   CaretMode caretMode = CaretAtZero ) const;
 #else
    // ### Qt 4.0: reduce these four to two functions
diff --git a/qmake/include/qstring.h b/qmake/include/qstring.h
index 2a87a5a..c1d6740 100644
--- a/qmake/include/qstring.h
+++ b/qmake/include/qstring.h
@@ -1,15 +1,14 @@
 /****************************************************************************
 ** $Id$
 **
-** Definition of the QString class, and related Unicode
+** Definition of the QString class, and related Unicode functions.
-** functions.
 **
 ** Created : 920609
 **
-** Copyright (C) 1992-2000 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.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
@@ -40,12 +39,19 @@
 #define QSTRING_H
 #ifndef QT_H
 #include "qcstring.h"
 #endif // QT_H
+#ifndef QT_NO_STL
+#include <string>
+#if defined(Q_WRONG_SB_CTYPE_MACROS) && defined(_SB_CTYPE_MACROS)
+#undef _SB_CTYPE_MACROS
+#endif
+#endif
 /*****************************************************************************
  QString class
 *****************************************************************************/
 class QRegExp;
@@ -333,40 +339,40 @@ inline bool operator>( QChar c, char ch ) { return !(ch>=c); }
 inline bool operator>( char ch, QChar c ) { return !(c>=ch); }
 inline bool operator>( QChar c1, QChar c2 ) { return !(c2>=c1); }
 // internal
 struct Q_EXPORT QStringData : public QShared {
    QStringData() :
-        QShared(), unicode(0), ascii(0), len(0), simpletext(1), maxl(0), dirty(0) { ref(); }
+        QShared(), unicode(0), ascii(0), len(0), issimpletext(TRUE), maxl(0), islatin1(FALSE) { ref(); }
    QStringData(QChar *u, uint l, uint m) :
-        QShared(), unicode(u), ascii(0), len(l), simpletext(1), maxl(m), dirty(1) { }
+        QShared(), unicode(u), ascii(0), len(l), issimpletext(FALSE), maxl(m), islatin1(FALSE) { }
    ~QStringData() { if ( unicode ) delete[] ((char*)unicode);
                     if ( ascii ) delete[] ascii; }
    void deleteSelf();
    QChar *unicode;
    char *ascii;
    void setDirty() {
        if ( ascii ) {
            delete [] ascii;
            ascii = 0;
        }
-        dirty = 1;
+        issimpletext = FALSE;
    }
 #ifdef Q_OS_MAC9
    uint len;
 #else
    uint len : 30;
 #endif
-    uint simpletext : 1;
+    uint issimpletext : 1;
 #ifdef Q_OS_MAC9
    uint maxl;
 #else
    uint maxl : 30;
 #endif
-    uint dirty : 1;
+    uint islatin1 : 1;
 private:
 #if defined(Q_DISABLE_COPY)
    QStringData( const QStringData& );
    QStringData& operator=( const QStringData& );
 #endif
@@ -381,17 +387,21 @@ public:
    QString( const QString & );                 // impl-shared copy
    QString( const QByteArray& );               // deep copy
    QString( const QChar* unicode, uint length ); // deep copy
 #ifndef QT_NO_CAST_ASCII
    QString( const char *str );                 // deep copy
 #endif
+#ifndef QT_NO_STL
+    QString( const std::string& );                   // deep copy
+#endif
    ~QString();
    QString    &operator=( const QString & );   // impl-shared copy
-#ifndef QT_NO_CAST_ASCII
    QString    &operator=( const char * );      // deep copy
+#ifndef QT_NO_STL
+    QString    &operator=( const std::string& );     // deep copy
 #endif
    QString    &operator=( const QCString& );   // deep copy
    QString    &operator=( QChar c );
    QString    &operator=( char c );
    QT_STATIC_CONST QString null;
@@ -491,19 +501,25 @@ public:
    QString    &append( QChar );
    QString    &append( const QString & );
 #ifndef QT_NO_CAST_ASCII
    QString    &append( const QByteArray & );
    QString    &append( const char * );
 #endif
+#ifndef QT_NO_STL
+    QString    &append( const std::string& );
+#endif
    QString    &prepend( char );
    QString    &prepend( QChar );
    QString    &prepend( const QString & );
 #ifndef QT_NO_CAST_ASCII
    QString    &prepend( const QByteArray & );
    QString    &prepend( const char * );
 #endif
+#ifndef QT_NO_STL
+    QString    &prepend( const std::string& );
+#endif
    QString    &remove( uint index, uint len );
    QString    &remove( QChar c );
    QString    &remove( char c ) { return remove( QChar(c) ); }
    QString    &remove( const QString & );
 #ifndef QT_NO_REGEXP
    QString    &remove( const QRegExp & );
@@ -553,12 +569,15 @@ public:
    QString    &operator+=( const QString &str );
 #ifndef QT_NO_CAST_ASCII
    QString    &operator+=( const QByteArray &str );
    QString    &operator+=( const char *str );
 #endif
+#ifndef QT_NO_STL
+    QString    &operator+=( const std::string& );
+#endif
    QString    &operator+=( QChar c );
    QString    &operator+=( char c );
    QChar at( uint i ) const
        { return i < d->len ? d->unicode[i] : QChar::null; }
    QChar operator[]( int i ) const { return at((uint)i); }
@@ -573,28 +592,34 @@ public:
                subat( i );
            d->setDirty();
            return d->unicode[i];
        }
    const QChar* unicode() const { return d->unicode; }
-    const char* ascii() const { return latin1(); }
+    const char* ascii() const;
+    static QString fromAscii(const char*, int len=-1);
    const char* latin1() const;
    static QString fromLatin1(const char*, int len=-1);
    QCString utf8() const;
    static QString fromUtf8(const char*, int len=-1);
    QCString local8Bit() const;
    static QString fromLocal8Bit(const char*, int len=-1);
    bool operator!() const;
 #ifndef QT_NO_ASCII_CAST
-    operator const char *() const { return latin1(); }
+    operator const char *() const { return ascii(); }
 #endif
+#ifndef QT_NO_STL
+    operator std::string() const { return ascii() ? ascii() : ""; }
+#endif
    static QString fromUcs2( const unsigned short *ucs2 );
    const unsigned short *ucs2() const;
    QString &setUnicode( const QChar* unicode, uint len );
    QString &setUnicodeCodes( const ushort* unicode_as_ushorts, uint len );
+    QString &setAscii( const char*, int len=-1 );
    QString &setLatin1( const char*, int len=-1 );
    int compare( const QString& s ) const;
    static int compare( const QString& s1, const QString& s2 )
    { return s1.compare( s2 ); }
@@ -606,21 +631,21 @@ public:
    friend Q_EXPORT QDataStream &operator>>( QDataStream &, QString & );
 #endif
    void compose();
 #ifndef QT_NO_COMPAT
-    const char* data() const { return latin1(); }
+    const char* data() const { return ascii(); }
 #endif
    bool startsWith( const QString& ) const;
    bool endsWith( const QString& ) const;
    void setLength( uint newLength );
-    bool simpleText() const { if ( d->dirty ) checkSimpleText(); return (bool)d->simpletext; }
+    bool simpleText() const { if ( !d->issimpletext ) checkSimpleText(); return (bool)d->issimpletext; }
    bool isRightToLeft() const;
 private:
            QString( int size, bool /* dummy */ );// allocate size incl. \0
@@ -628,15 +653,15 @@ private:
    void real_detach();
    void subat( uint );
    bool findArg(int& pos, int& len) const;
    void checkSimpleText() const;
-    static QChar* asciiToUnicode( const char*, uint * len, uint maxlen=(uint)-1 );
+    static QChar* latin1ToUnicode( const char*, uint * len, uint maxlen=(uint)-1 );
-    static QChar* asciiToUnicode( const QByteArray&, uint * len );
+    static QChar* latin1ToUnicode( const QByteArray&, uint * len );
-    static char* unicodeToAscii( const QChar*, uint len );
+    static char* unicodeToLatin1( const QChar*, uint len );
    QStringData *d;
    static QStringData* shared_null;
    static QStringData* makeSharedNull();
    friend class QConstString;
@@ -791,35 +816,47 @@ inline QString &QString::prepend( QChar c )
 inline QString &QString::prepend( char c )
 { return insert(0,c); }
 #ifndef QT_NO_CAST_ASCII
 inline QString &QString::prepend( const QByteArray & s )
-{ return insert(0,s.data()); }
+{ return insert(0,QString(s)); }
+#endif
+#ifndef QT_NO_STL
+inline QString &QString::prepend( const std::string& s )
+{ return insert(0, s); }
+#endif
+#ifndef QT_NO_CAST_ASCII
+inline QString &QString::operator+=( const QByteArray &s )
+{ return operator+=(QString(s)); }
 #endif
 inline QString &QString::append( const QString & s )
 { return operator+=(s); }
 #ifndef QT_NO_CAST_ASCII
 inline QString &QString::append( const QByteArray &s )
-{ return operator+=(s.data()); }
+{ return operator+=(s); }
 inline QString &QString::append( const char * s )
 { return operator+=(s); }
 #endif
 inline QString &QString::append( QChar c )
 { return operator+=(c); }
 inline QString &QString::append( char c )
 { return operator+=(c); }
-#ifndef QT_NO_CAST_ASCII
+#ifndef QT_NO_STL
-inline QString &QString::operator+=( const QByteArray &s )
+inline QString &QString::operator+=( const std::string& s )
-{ return operator+=(s.data()); }
+{ return operator+=(s.c_str()); }
+inline QString &QString::append( const std::string& s )
+{ return operator+=(s); }
 #endif
 inline QString &QString::setNum( short n, int base )
 { return setNum((long)n, base); }
 inline QString &QString::setNum( ushort n, int base )
@@ -851,16 +888,16 @@ inline int QString::find( char c, int index, bool cs ) const
 inline int QString::findRev( char c, int index, bool cs) const
 { return findRev( QChar(c), index, cs ); }
 #ifndef QT_NO_CAST_ASCII
 inline int QString::find( const char* str, int index ) const
-{ return find(QString::fromLatin1(str), index); }
+{ return find(QString::fromAscii(str), index); }
 inline int QString::findRev( const char* str, int index ) const
-{ return findRev(QString::fromLatin1(str), index); }
+{ return findRev(QString::fromAscii(str), index); }
 #endif
 /*****************************************************************************
  QString non-member operators
 *****************************************************************************/
@@ -894,19 +931,19 @@ Q_EXPORT inline const QString operator+( const QString &s1, const QString &s2 )
 }
 #ifndef QT_NO_CAST_ASCII
 Q_EXPORT inline const QString operator+( const QString &s1, const char *s2 )
 {
    QString tmp( s1 );
-    tmp += QString::fromLatin1(s2);
+    tmp += QString::fromAscii(s2);
    return tmp;
 }
 Q_EXPORT inline const QString operator+( const char *s1, const QString &s2 )
 {
-    QString tmp = QString::fromLatin1( s1 );
+    QString tmp = QString::fromAscii( s1 );
    tmp += s2;
    return tmp;
 }
 #endif
 Q_EXPORT inline const QString operator+( const QString &s1, QChar c2 )
@@ -944,7 +981,11 @@ extern Q_EXPORT QString qt_winQString(void*);
 extern Q_EXPORT const void* qt_winTchar(const QString& str, bool addnul);
 extern Q_EXPORT void* qt_winTchar_new(const QString& str);
 extern Q_EXPORT QCString qt_winQString2MB( const QString& s, int len=-1 );
 extern Q_EXPORT QString qt_winMB2QString( const char* mb, int len=-1 );
 #endif
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QSTRING
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QSTRING_H
diff --git a/qmake/include/qstrlist.h b/qmake/include/qstrlist.h
index 86de328..b9dd753 100644
--- a/qmake/include/qstrlist.h
+++ b/qmake/include/qstrlist.h
@@ -42,16 +42,18 @@
 #include "qstring.h"
 #include "qptrlist.h"
 #include "qdatastream.h"
 #endif // QT_H
+#ifndef QT_QWINEXPORT
 #if defined(Q_TEMPLATEDLL)
 Q_TEMPLATE_EXTERN template class Q_EXPORT QPtrList<char>;
 Q_TEMPLATE_EXTERN template class Q_EXPORT QPtrListIterator<char>;
 #endif
+#endif /* QT_QWINEXPORT */
 #if defined(Q_QDOC)
 class QStrListIterator : public QPtrListIterator<char>
 {
 };
 #else
diff --git a/qmake/include/qtextcodec.h b/qmake/include/qtextcodec.h
index 149b5cb..995e434 100644
--- a/qmake/include/qtextcodec.h
+++ b/qmake/include/qtextcodec.h
@@ -72,12 +72,17 @@ public:
    static QTextCodec* codecForName(const char* hint, int accuracy=0);
    static QTextCodec* codecForContent(const char* chars, int len);
    static QTextCodec* codecForIndex(int i);
    static QTextCodec* codecForLocale();
    static void setCodecForLocale(QTextCodec *c);
+    static QTextCodec* codecForTr();
+    static void setCodecForTr(QTextCodec *c);
+    static QTextCodec* codecForCStrings();
+    static void setCodecForCStrings(QTextCodec *c);
    static void deleteAllCodecs();
    static const char* locale();
    virtual const char* name() const = 0;
    virtual const char* mimeName() const;
@@ -85,13 +90,13 @@ public:
    virtual QTextDecoder* makeDecoder() const;
    virtual QTextEncoder* makeEncoder() const;
    virtual QString toUnicode(const char* chars, int len) const;
    virtual QCString fromUnicode(const QString& uc, int& lenInOut) const;
-    
    QCString fromUnicode(const QString& uc) const;
    QString toUnicode(const QByteArray&, int len) const;
    QString toUnicode(const QByteArray&) const;
    QString toUnicode(const QCString&, int len) const;
    QString toUnicode(const QCString&) const;
    QString toUnicode(const char* chars) const;
@@ -105,10 +110,19 @@ public:
    virtual unsigned short characterFromUnicode(const QString &str, int pos) const;
 protected:
    QTextCodec();
    static int simpleHeuristicNameMatch(const char* name, const char* hint);
+private:
+    static QTextCodec *cftr;
+    static QTextCodec *cfcs;
    friend class QFont;
 };
+inline QTextCodec* QTextCodec::codecForTr() { return cftr; }
+inline void QTextCodec::setCodecForTr(QTextCodec *c) { cftr = c; }
+inline QTextCodec* QTextCodec::codecForCStrings() { return cfcs; }
+inline void QTextCodec::setCodecForCStrings(QTextCodec *c) { cfcs = c; }
 #endif // QT_NO_TEXTCODEC
 #endif // QTEXTCODEC_H
diff --git a/qmake/include/qtl.h b/qmake/include/qtl.h
index 346cecc..25631fd 100644
--- a/qmake/include/qtl.h
+++ b/qmake/include/qtl.h
@@ -86,12 +86,13 @@ inline BiOutputIterator qCopyBackward( BiIterator _begin, BiIterator _end,
    return _dest;
 }
 template <class InputIterator1, class InputIterator2>
 inline bool qEqual( InputIterator1 first1, InputIterator1 last1, InputIterator2 first2 )
 {
+    // ### compare using !(*first1 == *first2) in Qt 4.0
    for ( ; first1 != last1; ++first1, ++first2 )
        if ( *first1 != *first2 )
            return FALSE;
    return TRUE;
 }
diff --git a/qmake/include/quuid.h b/qmake/include/quuid.h
index 591d2f1..664c149 100644
--- a/qmake/include/quuid.h
+++ b/qmake/include/quuid.h
@@ -1,14 +1,14 @@
 /****************************************************************************
 ** $Id$
 **
 ** Definition of QUuid class
 **
-** Created: 010523
+** Created : 010523
 **
-** Copyright (C) 1992-2001 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
@@ -50,13 +50,13 @@
 typedef struct _GUID
 {
    ulong   Data1;
    ushort  Data2;
    ushort  Data3;
    uchar   Data4[ 8 ];
-} GUID;
+} GUID, *REFGUID, *LPGUID;
 #endif
 #endif
 struct Q_EXPORT QUuid
 {
    QUuid()
diff --git a/qmake/include/qvaluelist.h b/qmake/include/qvaluelist.h
index 54f7aec..f5cd7bb 100644
--- a/qmake/include/qvaluelist.h
+++ b/qmake/include/qvaluelist.h
@@ -659,7 +659,11 @@ Q_INLINE_TEMPLATES QDataStream& operator<<( QDataStream& s, const QValueList<T>&
    QValueListConstIterator<T> it = l.begin();
    for( ; it != l.end(); ++it )
        s << *it;
    return s;
 }
 #endif // QT_NO_DATASTREAM
+#ifdef QT_QWINEXPORT
+#define Q_DEFINED_QVALUELIST
+#include "qwinexport.h"
+#endif /* QT_QWINEXPORT */
 #endif // QVALUELIST_H
diff --git a/qmake/include/qvaluestack.h b/qmake/include/qvaluestack.h
index 7e9bc48..c3f966e 100644
--- a/qmake/include/qvaluestack.h
+++ b/qmake/include/qvaluestack.h
@@ -2,13 +2,13 @@
 ** $Id$
 **
 ** Definition of QValueStack class
 **
 ** Created : 990925
 **
-** Copyright (C) 1992-2000 Trolltech AS.  All rights reserved.
+** Copyright (C) 1992-2003 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the tools module of the Qt GUI Toolkit.
 **
 ** This file may be distributed under the terms of the Q Public License
 ** as defined by Trolltech AS of Norway and appearing in the file
 ** LICENSE.QPL included in the packaging of this file.
@@ -51,13 +51,13 @@ public:
   ~QValueStack() {}
    void  push( const T& d ) { append(d); }
    T pop()
    {
        T elem( this->last() );
        if ( !this->isEmpty() )
-            remove( this->fromLast() );
+            this->remove( this->fromLast() );
        return elem;
    }
    T& top() { return this->last(); }
    const T& top() const { return this->last(); }
 };