Merge commit 'qt/master-stable'

Conflicts:
	configure.exe
	qmake/Makefile.unix
	qmake/generators/makefile.cpp
	src/corelib/global/qglobal.h
	src/corelib/kernel/kernel.pri
	src/corelib/kernel/qcoreevent.cpp
	src/corelib/kernel/qsharedmemory_unix.cpp
	src/gui/graphicsview/qgraphicsscene.cpp
	src/gui/kernel/qaction.cpp
	src/gui/kernel/qaction.h
	src/gui/kernel/qaction_p.h
	src/gui/kernel/qapplication.cpp
	src/gui/kernel/qapplication.h
	src/gui/kernel/qwidget.cpp
	src/gui/kernel/qwidget.h
	src/gui/kernel/qwidget_mac.mm
	src/gui/painting/qgraphicssystemfactory.cpp
	src/gui/styles/qwindowsstyle.cpp
	src/gui/text/qfontengine_qpf.cpp
	src/gui/widgets/qabstractscrollarea_p.h
	src/network/access/qnetworkaccessdebugpipebackend.cpp
	src/network/socket/qlocalsocket_unix.cpp
	src/network/socket/qnativesocketengine_p.h
	src/network/socket/qnativesocketengine_unix.cpp
	src/openvg/qpaintengine_vg.cpp
	tests/auto/q3sqlcursor/tst_q3sqlcursor.cpp
	tests/auto/qcssparser/qcssparser.pro
	tests/auto/qdir/tst_qdir.cpp
	tests/auto/qfile/tst_qfile.cpp
	tests/auto/qobject/tst_qobject.cpp
	tests/auto/qpathclipper/qpathclipper.pro
	tests/auto/qprocess/tst_qprocess.cpp
	tests/auto/qsettings/tst_qsettings.cpp
	tests/auto/qsharedpointer/qsharedpointer.pro
	tests/auto/qsqlquerymodel/qsqlquerymodel.pro
	tests/auto/qsqlrelationaltablemodel/qsqlrelationaltablemodel.pro
	tests/auto/qsqltablemodel/qsqltablemodel.pro
	tests/auto/qsqlthread/qsqlthread.pro
	tests/auto/qwidget/tst_qwidget.cpp

16 files changed, 285 insertions, 772 deletions

diff --git a/src/qt3support/canvas/q3canvas.cpp b/src/qt3support/canvas/q3canvas.cpp
index 034aff5791..948935c65e 100644
--- a/src/qt3support/canvas/q3canvas.cpp
+++ b/src/qt3support/canvas/q3canvas.cpp
@@ -4828,7 +4828,7 @@ void Q3CanvasText::draw(QPainter& painter)
 }
 
 /*!
-  \reimp
+  \internal
 */
 void Q3CanvasText::changeChunks()
 {
diff --git a/src/qt3support/dialogs/q3filedialog.cpp b/src/qt3support/dialogs/q3filedialog.cpp
index 031170eb90..a285fd804e 100644
--- a/src/qt3support/dialogs/q3filedialog.cpp
+++ b/src/qt3support/dialogs/q3filedialog.cpp
@@ -507,45 +507,7 @@ static void updateLastSize(Q3FileDialog *that)
     lastHeight = that->height() - extHeight;
 }
 
-// Don't remove the lines below!
-//
-// resolving the W methods manually is needed, because Windows 95 doesn't include
-// these methods in Shell32.lib (not even stubs!), so you'd get an unresolved symbol
-// when Qt calls getEsistingDirectory(), etc.
 #if defined(Q_WS_WIN)
-
-typedef UINT (WINAPI *PtrExtractIconEx)(LPCTSTR,int,HICON*,HICON*,UINT);
-static PtrExtractIconEx ptrExtractIconEx = 0;
-
-static void resolveLibs()
-{
-#ifndef Q_OS_WINCE
-    static bool triedResolve = false;
-
-    if (!triedResolve) {
-#ifndef QT_NO_THREAD
-        // protect initialization
-        QMutexLocker locker(QMutexPool::globalInstanceGet(&triedResolve));
-        // check triedResolve again, since another thread may have already
-        // done the initialization
-        if (triedResolve) {
-            // another thread did initialize the security function pointers,
-            // so we shouldn't do it again.
-            return;
-        }
-#endif
-        triedResolve = true;
-        if (qt_winUnicode()) {
-            QLibrary lib(QLatin1String("shell32"));
-            ptrExtractIconEx = (PtrExtractIconEx) lib.resolve("ExtractIconExW");
-        }
-    }
-#endif
-}
-#ifdef Q_OS_WINCE
-#define PtrExtractIconEx ExtractIconEx
-#endif
-
 class QWindowsIconProvider : public Q3FileIconProvider
 {
 public:
@@ -2566,11 +2528,7 @@ void Q3FileDialog::init()
     d->modeButtons->insert(d->previewInfo);
 
     d->previewContents = new QToolButton(this, "preview info view");
-#if defined(Q_WS_WIN) && !defined(Q_OS_WINCE)
-    if ((qWinVersion() & Qt::WV_NT_based) > Qt::WV_NT)
-#else
     if (!qstrcmp(style()->className(), "QWindowsStyle"))
-#endif
     {
         d->goBack->setAutoRaise(true);
         d->cdToParent->setAutoRaise(true);
@@ -4878,33 +4836,20 @@ Q3FileIconProvider * Q3FileDialog::iconProvider()
 static QString getWindowsRegString(HKEY key, const QString &subKey)
 {
     QString s;
-    QT_WA({
-        char buf[1024];
-        DWORD bsz = sizeof(buf);
-        int r = RegQueryValueEx(key, (TCHAR*)subKey.ucs2(), 0, 0, (LPBYTE)buf, &bsz);
-        if (r == ERROR_SUCCESS) {
-            s = QString::fromUcs2((unsigned short *)buf);
-        } else if (r == ERROR_MORE_DATA) {
-            char *ptr = new char[bsz+1];
-            r = RegQueryValueEx(key, (TCHAR*)subKey.ucs2(), 0, 0, (LPBYTE)ptr, &bsz);
-            if (r == ERROR_SUCCESS)
-                s = QLatin1String(ptr);
-            delete [] ptr;
-        }
-    } , {
-        char buf[512];
-        DWORD bsz = sizeof(buf);
-        int r = RegQueryValueExA(key, subKey.local8Bit(), 0, 0, (LPBYTE)buf, &bsz);
-        if (r == ERROR_SUCCESS) {
-            s = QLatin1String(buf);
-        } else if (r == ERROR_MORE_DATA) {
-            char *ptr = new char[bsz+1];
-            r = RegQueryValueExA(key, subKey.local8Bit(), 0, 0, (LPBYTE)ptr, &bsz);
-            if (r == ERROR_SUCCESS)
-                s = QLatin1String(ptr);
-            delete [] ptr;
-        }
-    });
+
+    wchar_t buf[1024];
+    DWORD bsz = sizeof(buf) / sizeof(wchar_t);
+    int r = RegQueryValueEx(key, (wchar_t*)subKey.utf16(), 0, 0, (LPBYTE)buf, &bsz);
+    if (r == ERROR_SUCCESS) {
+        s = QString::fromWCharArray(buf);
+    } else if (r == ERROR_MORE_DATA) {
+        char *ptr = new char[bsz+1];
+        r = RegQueryValueEx(key, (wchar_t*)subKey.utf16(), 0, 0, (LPBYTE)ptr, &bsz);
+        if (r == ERROR_SUCCESS)
+            s = QLatin1String(ptr);
+        delete [] ptr;
+    }
+
     return s;
 }
 
@@ -4925,22 +4870,13 @@ QWindowsIconProvider::QWindowsIconProvider(QObject *parent, const char *name)
 
     HKEY k;
     HICON si;
-    int r;
     QString s;
     UINT res = 0;
 
     // ---------- get default folder pixmap
     const wchar_t iconFolder[] = L"folder\\DefaultIcon"; // workaround for Borland
-    QT_WA({
-        r = RegOpenKeyEx(HKEY_CLASSES_ROOT,
-                           iconFolder,
-                           0, KEY_READ, &k);
-    } , {
-        r = RegOpenKeyExA(HKEY_CLASSES_ROOT,
-                           "folder\\DefaultIcon",
-                           0, KEY_READ, &k);
-    });
-    resolveLibs();
+    int r = RegOpenKeyEx(HKEY_CLASSES_ROOT, iconFolder, 0, KEY_READ, &k);
+
     if (r == ERROR_SUCCESS) {
         s = getWindowsRegString(k, QString());
         RegCloseKey(k);
@@ -4948,21 +4884,7 @@ QWindowsIconProvider::QWindowsIconProvider(QObject *parent, const char *name)
         QStringList lst = QStringList::split(QLatin1String(","), s);
 
         if (lst.count() >= 2) { // don't just assume that lst has two entries
-#ifndef Q_OS_WINCE
-            QT_WA({
-                res = ptrExtractIconEx((TCHAR*)lst[0].simplifyWhiteSpace().ucs2(),
-                                       lst[1].simplifyWhiteSpace().toInt(),
-                                       0, &si, 1);
-            } , {
-                res = ExtractIconExA(lst[0].simplifyWhiteSpace().local8Bit(),
-                                     lst[1].simplifyWhiteSpace().toInt(),
-                                     0, &si, 1);
-            });
-#else
-            res = (UINT)ExtractIconEx((TCHAR*)lst[0].simplifyWhiteSpace().ucs2(),
-                                        lst[1].simplifyWhiteSpace().toInt(),
-                                        0, &si, 1);
-#endif
+            res = ExtractIconEx((wchar_t*)lst[0].simplifyWhiteSpace().utf16(), lst[1].simplifyWhiteSpace().toInt(), 0, &si, 1);
         }
 
         if (res) {
@@ -4978,18 +4900,7 @@ QWindowsIconProvider::QWindowsIconProvider(QObject *parent, const char *name)
     }
 
     //------------------------------- get default file pixmap
-#ifndef Q_OS_WINCE
-    QT_WA({
-        res = ptrExtractIconEx(L"shell32.dll",
-                                 0, 0, &si, 1);
-    } , {
-        res = ExtractIconExA("shell32.dll",
-                                 0, 0, &si, 1);
-    });
-#else
-        res = (UINT)ExtractIconEx(L"shell32.dll",
-                                    0, 0, &si, 1);
-#endif
+    res = ExtractIconEx(L"shell32.dll", 0, 0, &si, 1);
 
     if (res) {
         defaultFile  = fromHICON(si);
@@ -5002,16 +4913,9 @@ QWindowsIconProvider::QWindowsIconProvider(QObject *parent, const char *name)
 
     //------------------------------- get default exe pixmap
 #ifndef Q_OS_WINCE
-    QT_WA({
-        res = ptrExtractIconEx(L"shell32.dll",
-                              2, 0, &si, 1);
-    } , {
-        res = ExtractIconExA("shell32.dll",
-                          2, 0, &si, 1);
-    });
+    res = ExtractIconEx(L"shell32.dll", 2, 0, &si, 1);
 #else
-        res = (UINT)ExtractIconEx(L"ceshell.dll",
-                                    10, 0, &si, 1);
+    res = ExtractIconEx(L"ceshell.dll", 10, 0, &si, 1);
 #endif
 
     if (res) {
@@ -5050,14 +4954,7 @@ const QPixmap * QWindowsIconProvider::pixmap(const QFileInfo &fi)
             return &(*it);
 
         HKEY k, k2;
-        int r;
-        QT_WA({
-            r = RegOpenKeyEx(HKEY_CLASSES_ROOT, (TCHAR*)ext.ucs2(),
-                              0, KEY_READ, &k);
-        } , {
-            r = RegOpenKeyExA(HKEY_CLASSES_ROOT, ext.local8Bit(),
-                               0, KEY_READ, &k);
-        });
+        int r = RegOpenKeyEx(HKEY_CLASSES_ROOT, (wchar_t*)ext.utf16(), 0, KEY_READ, &k);
         QString s;
         if (r == ERROR_SUCCESS) {
             s = getWindowsRegString(k, QString());
@@ -5068,13 +4965,8 @@ const QPixmap * QWindowsIconProvider::pixmap(const QFileInfo &fi)
         }
         RegCloseKey(k);
 
-        QT_WA({
-            r = RegOpenKeyEx(HKEY_CLASSES_ROOT, (TCHAR*)QString(s + QLatin1String("\\DefaultIcon")).ucs2(),
-                               0, KEY_READ, &k2);
-        } , {
-            r = RegOpenKeyExA(HKEY_CLASSES_ROOT, QString(s + QLatin1String("\\DefaultIcon")).local8Bit() ,
-                               0, KEY_READ, &k2);
-        });
+        r = RegOpenKeyEx(HKEY_CLASSES_ROOT, (wchar_t*)QString(s + QLatin1String("\\DefaultIcon")).utf16(),
+                         0, KEY_READ, &k2);
         if (r == ERROR_SUCCESS) {
             s = getWindowsRegString(k2, QString());
         } else {
@@ -5104,19 +4996,7 @@ const QPixmap * QWindowsIconProvider::pixmap(const QFileInfo &fi)
                 if (filepath[0] == QLatin1Char('"') && filepath[(int)filepath.length()-1] == QLatin1Char('"'))
                     filepath = filepath.mid(1, filepath.length()-2);
 
-                resolveLibs();
-#ifndef Q_OS_WINCE
-                QT_WA({
-                    res = ptrExtractIconEx((TCHAR*)filepath.ucs2(), lst[1].stripWhiteSpace().toInt(),
-                        0, &si, 1);
-                } , {
-                    res = ExtractIconExA(filepath.local8Bit(), lst[1].stripWhiteSpace().toInt(),
-                        0, &si, 1);
-                });
-#else
-                res = (UINT)ExtractIconEx((TCHAR*)filepath.ucs2(), lst[1].stripWhiteSpace().toInt(),
-                    0, &si, 1);
-#endif
+                res = ExtractIconEx((wchar_t*)filepath.utf16(), lst[1].stripWhiteSpace().toInt(), 0, &si, 1);
             }
         }
         if (res) {
@@ -5133,32 +5013,9 @@ const QPixmap * QWindowsIconProvider::pixmap(const QFileInfo &fi)
         HICON si;
         UINT res = 0;
         if (!fi.absFilePath().isEmpty()) {
-#ifndef Q_OS_WINCE
-            QT_WA({
-                res = ptrExtractIconEx((TCHAR*)fi.absFilePath().ucs2(), -1,
-                                      0, 0, 1);
-            } , {
-                res = ExtractIconExA(fi.absFilePath().local8Bit(), -1,
-                                      0, 0, 1);
-            });
-
-            if (res) {
-                QT_WA({
-                    res = ptrExtractIconEx((TCHAR*)fi.absFilePath().ucs2(), res - 1,
-                                          0, &si, 1);
-                } , {
-                    res = ExtractIconExA(fi.absFilePath().local8Bit(), res - 1,
-                                          0, &si, 1);
-                });
-            }
-#else
-                res = (UINT)ExtractIconEx((TCHAR*)fi.absFilePath().ucs2(), -1,
-                                            0, 0, 1);
-                if (res)
-                    res = (UINT)ExtractIconEx((TCHAR*)fi.absFilePath().ucs2(), res - 1,
-                                                0, &si, 1);
-#endif
-
+            res = ExtractIconEx((wchar_t*)fi.absFilePath().utf16(), -1, 0, 0, 1);
+            if (res)
+                res = ExtractIconEx((wchar_t*)fi.absFilePath().utf16(), res - 1, 0, &si, 1);
         }
 
         if (res) {
@@ -5760,13 +5617,8 @@ void Q3FileDialog::insertEntry(const Q3ValueList<QUrlInfo> &lst, Q3NetworkOperat
                 if (!file.endsWith(QLatin1Char('/')))
                     file.append(QLatin1Char('/'));
                 file += inf.name();
-                QT_WA({
-                    if (GetFileAttributesW((TCHAR*)file.ucs2()) & FILE_ATTRIBUTE_HIDDEN)
-                        continue;
-                } , {
-                    if (GetFileAttributesA(file.local8Bit()) & FILE_ATTRIBUTE_HIDDEN)
-                        continue;
-                });
+                if (GetFileAttributes((wchar_t*)file.utf16()) & FILE_ATTRIBUTE_HIDDEN)
+                    continue;
             } else {
                 if (inf.name() != QLatin1String("..") && inf.name()[0] == QLatin1Char('.'))
                     continue;
diff --git a/src/qt3support/dialogs/q3filedialog_win.cpp b/src/qt3support/dialogs/q3filedialog_win.cpp
index ed86fa211d..487097ace0 100644
--- a/src/qt3support/dialogs/q3filedialog_win.cpp
+++ b/src/qt3support/dialogs/q3filedialog_win.cpp
@@ -64,49 +64,6 @@
 
 QT_BEGIN_NAMESPACE
 
-// Don't remove the lines below!
-//
-// resolving the W methods manually is needed, because Windows 95 doesn't include
-// these methods in Shell32.lib (not even stubs!), so you'd get an unresolved symbol
-// when Qt calls getEsistingDirectory(), etc.
-typedef LPITEMIDLIST (WINAPI *PtrSHBrowseForFolder)(BROWSEINFO*);
-static PtrSHBrowseForFolder ptrSHBrowseForFolder = 0;
-typedef BOOL (WINAPI *PtrSHGetPathFromIDList)(LPITEMIDLIST,LPWSTR);
-static PtrSHGetPathFromIDList ptrSHGetPathFromIDList = 0;
-
-static void resolveLibs()
-{
-#ifndef Q_OS_WINCE
-    static bool triedResolve = false;
-
-    if (!triedResolve) {
-#ifndef QT_NO_THREAD
-        // protect initialization
-        QMutexLocker locker(QMutexPool::globalInstanceGet(&triedResolve));
-        // check triedResolve again, since another thread may have already
-        // done the initialization
-        if (triedResolve) {
-            // another thread did initialize the security function pointers,
-            // so we shouldn't do it again.
-            return;
-        }
-#endif
-
-        triedResolve = true;
-        if (qt_winUnicode()) {
-            QLibrary lib(QLatin1String("shell32"));
-            ptrSHBrowseForFolder = (PtrSHBrowseForFolder) lib.resolve("SHBrowseForFolderW");
-            ptrSHGetPathFromIDList = (PtrSHGetPathFromIDList) lib.resolve("SHGetPathFromIDListW");
-        }
-    }
-#endif
-}
-#ifdef Q_OS_WINCE
-#define PtrSHBrowseForFolder SHBrowseForFolder ;
-#define PtrSHGetPathFromIDList SHGetPathFromIDList;
-#endif
-
-
 extern const char qt3_file_dialog_filter_reg_exp[]; // defined in qfiledialog.cpp
 
 const int maxNameLen = 1023;
@@ -168,80 +125,8 @@ static QString selFilter(const QString& filter, DWORD idx)
     return filterLst[(int)idx - 1];
 }
 
-#ifndef Q_OS_WINCE
-// Static vars for OFNA funcs:
-static QByteArray aInitDir;
-static QByteArray aInitSel;
-static QByteArray aTitle;
-static QByteArray aFilter;
-// Use ANSI strings and API
-
-// If you change this, then make sure you change makeOFN (below) too
-static
-OPENFILENAMEA* makeOFNA(QWidget* parent,
-                         const QString& initialSelection,
-                         const QString& initialDirectory,
-                         const QString& title,
-                         const QString& filters,
-                         Q3FileDialog::Mode mode)
-{
-    if (parent)
-        parent = parent->window();
-    else
-        parent = qApp->activeWindow();
-
-    aTitle = title.local8Bit();
-    aInitDir = QDir::toNativeSeparators(initialDirectory).local8Bit();
-    if (initialSelection.isEmpty())
-        aInitSel = "";
-    else
-        aInitSel = QDir::toNativeSeparators(initialSelection).local8Bit();
-    int maxLen = mode == Q3FileDialog::ExistingFiles ? maxMultiLen : maxNameLen;
-    aInitSel.resize(maxLen + 1);                // make room for return value
-    aFilter = filters.local8Bit();
-
-    OPENFILENAMEA* ofn = new OPENFILENAMEA;
-    memset(ofn, 0, sizeof(OPENFILENAMEA));
-
-#if defined(Q_CC_BOR) && (WINVER >= 0x0500) && (_WIN32_WINNT >= 0x0500)
-    // according to the MSDN, this should also be necessary for MSVC, but
-    // OPENFILENAME_SIZE_VERSION_400A is in not Microsoft header, as it seems
-    if (QApplication::winVersion()==Qt::WV_NT || QApplication::winVersion()&Qt::WV_DOS_based) {
-        ofn->lStructSize= OPENFILENAME_SIZE_VERSION_400A;
-    } else {
-        ofn->lStructSize= sizeof(OPENFILENAMEA);
-    }
-#else
-    ofn->lStructSize        = sizeof(OPENFILENAMEA);
-#endif
-    ofn->hwndOwner        = parent ? parent->winId() : 0;
-    ofn->lpstrFilter        = aFilter;
-    ofn->lpstrFile        = aInitSel.data();
-    ofn->nMaxFile        = maxLen;
-    ofn->lpstrInitialDir = aInitDir.data();
-    ofn->lpstrTitle        = aTitle.data();
-    ofn->Flags                = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY);
-
-    if (mode == Q3FileDialog::ExistingFile ||
-         mode == Q3FileDialog::ExistingFiles)
-        ofn->Flags |= (OFN_FILEMUSTEXIST | OFN_PATHMUSTEXIST);
-    if (mode == Q3FileDialog::ExistingFiles)
-        ofn->Flags |= (OFN_ALLOWMULTISELECT | OFN_EXPLORER);
-
-    return ofn;
-}
-
-static void cleanUpOFNA(OPENFILENAMEA** ofn)
-{
-    delete *ofn;
-    *ofn = 0;
-}
-#endif
-
 static QString tFilters, tTitle, tInitDir;
 
-#ifdef UNICODE
-// If you change this, then make sure you change makeOFNA (above) too
 static
 OPENFILENAME* makeOFN(QWidget* parent,
                        const QString& initialSelection,
@@ -261,33 +146,23 @@ OPENFILENAME* makeOFN(QWidget* parent,
     QString initSel = QDir::toNativeSeparators(initialSelection);
 
     int maxLen = mode == Q3FileDialog::ExistingFiles ? maxMultiLen : maxNameLen;
-    TCHAR *tInitSel = new TCHAR[maxLen+1];
+    wchar_t *tInitSel = new wchar_t[maxLen+1];
     if (initSel.length() > 0 && initSel.length() <= maxLen)
-        memcpy(tInitSel, initSel.ucs2(), (initSel.length()+1)*sizeof(QChar));
+        memcpy(tInitSel, initSel.utf16(), (initSel.length() + 1) * sizeof(wchar_t));
     else
         tInitSel[0] = 0;
 
     OPENFILENAME* ofn = new OPENFILENAME;
     memset(ofn, 0, sizeof(OPENFILENAME));
 
-#if defined(Q_CC_BOR) && (WINVER >= 0x0500) && (_WIN32_WINNT >= 0x0500)
-    // according to the MSDN, this should also be necessary for MSVC, but
-    // OPENFILENAME_SIZE_VERSION_400 is in not Microsoft header, as it seems
-    if (QApplication::winVersion()==Qt::WV_NT || QApplication::winVersion()&Qt::WV_DOS_based) {
-        ofn->lStructSize= OPENFILENAME_SIZE_VERSION_400;
-    } else {
-        ofn->lStructSize        = sizeof(OPENFILENAME);
-    }
-#else
-    ofn->lStructSize        = sizeof(OPENFILENAME);
-#endif
-    ofn->hwndOwner        = parent ? parent->winId() : 0;
-    ofn->lpstrFilter        = (TCHAR *)tFilters.ucs2();
-    ofn->lpstrFile        = tInitSel;
+    ofn->lStructSize     = sizeof(OPENFILENAME);
+    ofn->hwndOwner       = parent ? parent->winId() : 0;
+    ofn->lpstrFilter     = (wchar_t*)tFilters.utf16();
+    ofn->lpstrFile       = tInitSel;
     ofn->nMaxFile        = maxLen;
-    ofn->lpstrInitialDir = (TCHAR *)tInitDir.ucs2();
-    ofn->lpstrTitle        = (TCHAR *)tTitle.ucs2();
-    ofn->Flags                = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY);
+    ofn->lpstrInitialDir = (wchar_t*)tInitDir.utf16();
+    ofn->lpstrTitle      = (wchar_t*)tTitle.utf16();
+    ofn->Flags           = (OFN_NOCHANGEDIR | OFN_HIDEREADONLY);
 
     if (mode == Q3FileDialog::ExistingFile ||
          mode == Q3FileDialog::ExistingFiles)
@@ -298,7 +173,6 @@ OPENFILENAME* makeOFN(QWidget* parent,
     return ofn;
 }
 
-
 static void cleanUpOFN(OPENFILENAME** ofn)
 {
     delete (*ofn)->lpstrFile;
@@ -306,8 +180,6 @@ static void cleanUpOFN(OPENFILENAME** ofn)
     *ofn = 0;
 }
 
-#endif // UNICODE
-
 QString Q3FileDialog::winGetOpenFileName(const QString &initialSelection,
                                          const QString &filter,
                                          QString* initialDirectory,
@@ -349,31 +221,18 @@ QString Q3FileDialog::winGetOpenFileName(const QString &initialSelection,
         QApplication::sendEvent(parent, &e);
         QApplicationPrivate::enterModal(parent);
     }
-    QT_WA({
-        // Use Unicode strings and API
-        OPENFILENAME* ofn = makeOFN(parent, isel,
-                                     *initialDirectory, title,
-                                     winFilter(filter), ExistingFile);
-        if (idx)
-            ofn->nFilterIndex = idx + 1;
-        if (GetOpenFileName(ofn)) {
-            result = QString::fromUcs2((ushort*)ofn->lpstrFile);
-            selFilIdx = ofn->nFilterIndex;
-        }
-        cleanUpOFN(&ofn);
-    } , {
-        // Use ANSI strings and API
-        OPENFILENAMEA* ofn = makeOFNA(parent, isel,
-                                       *initialDirectory, title,
-                                       winFilter(filter), ExistingFile);
-        if (idx)
-            ofn->nFilterIndex = idx + 1;
-        if (GetOpenFileNameA(ofn)) {
-            result = QString::fromLocal8Bit(ofn->lpstrFile);
-            selFilIdx = ofn->nFilterIndex;
-        }
-        cleanUpOFNA(&ofn);
-    });
+
+    OPENFILENAME* ofn = makeOFN(parent, isel,
+                                *initialDirectory, title,
+                                winFilter(filter), ExistingFile);
+    if (idx)
+        ofn->nFilterIndex = idx + 1;
+    if (GetOpenFileName(ofn)) {
+        result = QString::fromWCharArray(ofn->lpstrFile);
+        selFilIdx = ofn->nFilterIndex;
+    }
+    cleanUpOFN(&ofn);
+
     if (parent) {
         QApplicationPrivate::leaveModal(parent);
         QEvent e(QEvent::WindowUnblocked);
@@ -433,31 +292,18 @@ QString Q3FileDialog::winGetSaveFileName(const QString &initialSelection,
         QApplication::sendEvent(parent, &e);
         QApplicationPrivate::enterModal(parent);
     }
-    QT_WA({
-        // Use Unicode strings and API
-        OPENFILENAME* ofn = makeOFN(parent, isel,
-                                     *initialDirectory, title,
-                                     winFilter(filter), AnyFile);
-        if (idx)
-            ofn->nFilterIndex = idx + 1;
-        if (GetSaveFileName(ofn)) {
-            result = QString::fromUcs2((ushort*)ofn->lpstrFile);
-            selFilIdx = ofn->nFilterIndex;
-        }
-        cleanUpOFN(&ofn);
-    } , {
-        // Use ANSI strings and API
-        OPENFILENAMEA* ofn = makeOFNA(parent, isel,
-                                       *initialDirectory, title,
-                                       winFilter(filter), AnyFile);
-        if (idx)
-            ofn->nFilterIndex = idx + 1;
-        if (GetSaveFileNameA(ofn)) {
-            result = QString::fromLocal8Bit(ofn->lpstrFile);
-            selFilIdx = ofn->nFilterIndex;
-        }
-        cleanUpOFNA(&ofn);
-    });
+
+    OPENFILENAME* ofn = makeOFN(parent, isel,
+                                 *initialDirectory, title,
+                                 winFilter(filter), AnyFile);
+    if (idx)
+        ofn->nFilterIndex = idx + 1;
+    if (GetSaveFileName(ofn)) {
+        result = QString::fromWCharArray(ofn->lpstrFile);
+        selFilIdx = ofn->nFilterIndex;
+    }
+    cleanUpOFN(&ofn);
+
     if (parent) {
         QApplicationPrivate::leaveModal(parent);
         QEvent e(QEvent::WindowUnblocked);
@@ -519,69 +365,38 @@ QStringList Q3FileDialog::winGetOpenFileNames(const QString &filter,
         QApplication::sendEvent(parent, &e);
         QApplicationPrivate::enterModal(parent);
     }
-    QT_WA({
-        OPENFILENAME* ofn = makeOFN(parent, isel,
-                                     *initialDirectory, title,
-                                     winFilter(filter), ExistingFiles);
-        if (idx)
-            ofn->nFilterIndex = idx + 1;
-        if (GetOpenFileName(ofn)) {
-            QString fileOrDir = QString::fromUcs2((ushort*)ofn->lpstrFile);
-            selFilIdx = ofn->nFilterIndex;
-            int offset = fileOrDir.length() + 1;
-            if (ofn->lpstrFile[offset] == 0) {
-                // Only one file selected; has full path
-                fi.setFile(fileOrDir);
-                QString res = fi.absFilePath();
-                if (!res.isEmpty())
-                    result.append(res);
-            }
-            else {
-                // Several files selected; first string is path
-                dir.setPath(fileOrDir);
-                QString f;
-                while(!(f = QString::fromUcs2((ushort*)ofn->lpstrFile+offset)).isEmpty()) {
-                    fi.setFile(dir, f);
-                    QString res = fi.absFilePath();
-                    if (!res.isEmpty())
-                        result.append(res);
-                    offset += f.length() + 1;
-                }
-            }
+
+    OPENFILENAME* ofn = makeOFN(parent, isel,
+                                 *initialDirectory, title,
+                                 winFilter(filter), ExistingFiles);
+    if (idx)
+        ofn->nFilterIndex = idx + 1;
+    if (GetOpenFileName(ofn)) {
+        QString fileOrDir = QString::fromWCharArray(ofn->lpstrFile);
+        selFilIdx = ofn->nFilterIndex;
+        int offset = fileOrDir.length() + 1;
+        if (ofn->lpstrFile[offset] == 0) {
+            // Only one file selected; has full path
+            fi.setFile(fileOrDir);
+            QString res = fi.absFilePath();
+            if (!res.isEmpty())
+                result.append(res);
         }
-        cleanUpOFN(&ofn);
-    } , {
-        OPENFILENAMEA* ofn = makeOFNA(parent, isel,
-                                       *initialDirectory, title,
-                                       winFilter(filter), ExistingFiles);
-        if (idx)
-            ofn->nFilterIndex = idx + 1;
-        if (GetOpenFileNameA(ofn)) {
-            QByteArray fileOrDir(ofn->lpstrFile);
-            selFilIdx = ofn->nFilterIndex;
-            int offset = fileOrDir.length() + 1;
-            if (ofn->lpstrFile[offset] == '\0') {
-                // Only one file selected; has full path
-                fi.setFile(QString::fromLocal8Bit(fileOrDir));
+        else {
+            // Several files selected; first string is path
+            dir.setPath(fileOrDir);
+            QString f;
+            while (!(f = QString::fromWCharArray(ofn->lpstrFile + offset)).isEmpty()) {
+                fi.setFile(dir, f);
                 QString res = fi.absFilePath();
                 if (!res.isEmpty())
                     result.append(res);
+                offset += f.length() + 1;
             }
-            else {
-                // Several files selected; first string is path
-                dir.setPath(QString::fromLocal8Bit(fileOrDir));
-                QByteArray f;
-                while(!(f = QByteArray(ofn->lpstrFile + offset)).isEmpty()) {
-                    fi.setFile(dir, QString::fromLocal8Bit(f));
-                    QString res = fi.absFilePath();
-                    if (!res.isEmpty())
-                        result.append(res);
-                    offset += f.length() + 1;
-                }
-            }
-            cleanUpOFNA(&ofn);
         }
-    });
+    }
+    cleanUpOFN(&ofn);
+
     if (parent) {
         QApplicationPrivate::leaveModal(parent);
         QEvent e(QEvent::WindowUnblocked);
@@ -607,34 +422,17 @@ static int __stdcall winGetExistDirCallbackProc(HWND hwnd,
     if (uMsg == BFFM_INITIALIZED && lpData != 0) {
         QString *initDir = (QString *)(lpData);
         if (!initDir->isEmpty()) {
-            // ### Lars asks: is this correct for the A version????
-            QT_WA({
-                SendMessage(hwnd, BFFM_SETSELECTION, TRUE, Q_ULONG(initDir->ucs2()));
-            } , {
-                SendMessageA(hwnd, BFFM_SETSELECTION, TRUE, Q_ULONG(initDir->ucs2()));
-            });
+            SendMessage(hwnd, BFFM_SETSELECTION, TRUE, Q_ULONG(initDir->utf16()));
         }
     } else if (uMsg == BFFM_SELCHANGED) {
-        QT_WA({
-            resolveLibs();
-            TCHAR path[MAX_PATH];
-            ptrSHGetPathFromIDList(LPITEMIDLIST(lParam), path);
-            QString tmpStr = QString::fromUcs2((ushort*)path);
-            if (!tmpStr.isEmpty())
-                SendMessage(hwnd, BFFM_ENABLEOK, 1, 1);
-            else
-                SendMessage(hwnd, BFFM_ENABLEOK, 0, 0);
-            SendMessage(hwnd, BFFM_SETSTATUSTEXT, 1, Q_ULONG(path));
-        } , {
-            char path[MAX_PATH];
-            SHGetPathFromIDListA(LPITEMIDLIST(lParam), path);
-            QString tmpStr = QString::fromLocal8Bit(path);
-            if (!tmpStr.isEmpty())
-                SendMessageA(hwnd, BFFM_ENABLEOK, 1, 1);
-            else
-                SendMessageA(hwnd, BFFM_ENABLEOK, 0, 0);
-            SendMessageA(hwnd, BFFM_SETSTATUSTEXT, 1, Q_ULONG(path));
-        });
+        wchar_t path[MAX_PATH];
+        SHGetPathFromIDList(LPITEMIDLIST(lParam), path);
+        QString tmpStr = QString::fromWCharArray(path);
+        if (!tmpStr.isEmpty())
+            SendMessage(hwnd, BFFM_ENABLEOK, 1, 1);
+        else
+            SendMessage(hwnd, BFFM_ENABLEOK, 0, 0);
+        SendMessage(hwnd, BFFM_SETSTATUSTEXT, 1, Q_ULONG(path));
     }
 #endif
     return 0;
@@ -666,76 +464,42 @@ QString Q3FileDialog::winGetExistingDirectory(const QString& initialDirectory,
         QApplication::sendEvent(parent, &e);
         QApplicationPrivate::enterModal(parent);
     }
-    QT_WA({
-        resolveLibs();
-        QString initDir = QDir::toNativeSeparators(initialDirectory);
-        TCHAR path[MAX_PATH];
-        TCHAR initPath[MAX_PATH];
-        initPath[0] = 0;
-        path[0] = 0;
-        tTitle = title;
-        BROWSEINFO bi;
-        bi.hwndOwner = (parent ? parent->winId() : 0);
-        bi.pidlRoot = NULL;
-        bi.lpszTitle = (TCHAR*)tTitle.ucs2();
-        bi.pszDisplayName = initPath;
-        bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NEWDIALOGSTYLE;
-        bi.lpfn = winGetExistDirCallbackProc;
-        bi.lParam = Q_ULONG(&initDir);
-        LPITEMIDLIST pItemIDList = ptrSHBrowseForFolder(&bi);
-        if (pItemIDList) {
-            ptrSHGetPathFromIDList(pItemIDList, path);
-            IMalloc *pMalloc;
-            if (SHGetMalloc(&pMalloc) != NOERROR)
-                result.clear();
-            else {
-                pMalloc->Free(pItemIDList);
-                pMalloc->Release();
-                result = QString::fromUcs2((ushort*)path);
-            }
-        } else
-            result.clear();
-        tTitle.clear();
-    } , {
-        QString initDir = QDir::toNativeSeparators(initialDirectory);
-        char path[MAX_PATH];
-        char initPath[MAX_PATH];
-        QByteArray ctitle = title.toLocal8Bit();
-        initPath[0]=0;
-        path[0]=0;
-        BROWSEINFOA bi;
-        bi.hwndOwner = (parent ? parent->winId() : 0);
-        bi.pidlRoot = NULL;
-        bi.lpszTitle = ctitle;
-        bi.pszDisplayName = initPath;
-        bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NEWDIALOGSTYLE;
-        bi.lpfn = winGetExistDirCallbackProc;
-        bi.lParam = Q_ULONG(&initDir);
-        LPITEMIDLIST pItemIDList = SHBrowseForFolderA(&bi);
-        if (pItemIDList) {
-            SHGetPathFromIDListA(pItemIDList, path);
-            IMalloc *pMalloc;
-            if (SHGetMalloc(&pMalloc) != NOERROR)
-                result.clear();
-            else {
-                pMalloc->Free(pItemIDList);
-                pMalloc->Release();
-                result = QString::fromLocal8Bit(path);
-            }
-        } else
+
+    QString initDir = QDir::toNativeSeparators(initialDirectory);
+    wchar_t path[MAX_PATH];
+    wchar_t initPath[MAX_PATH];
+    initPath[0] = 0;
+    path[0] = 0;
+    tTitle = title;
+    BROWSEINFO bi;
+    bi.hwndOwner = (parent ? parent->winId() : 0);
+    bi.pidlRoot = NULL;
+    bi.lpszTitle = (wchar_t*)tTitle.utf16();
+    bi.pszDisplayName = initPath;
+    bi.ulFlags = BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_NEWDIALOGSTYLE;
+    bi.lpfn = winGetExistDirCallbackProc;
+    bi.lParam = Q_ULONG(&initDir);
+    LPITEMIDLIST pItemIDList = SHBrowseForFolder(&bi);
+    if (pItemIDList) {
+        SHGetPathFromIDList(pItemIDList, path);
+        IMalloc *pMalloc;
+        if (SHGetMalloc(&pMalloc) != NOERROR)
             result.clear();
-    });
+        else {
+            pMalloc->Free(pItemIDList);
+            pMalloc->Release();
+            result = QString::fromWCharArray(path);
+        }
+    } else
+        result.clear();
+    tTitle.clear();
+
     if (parent) {
         QApplicationPrivate::leaveModal(parent);
         QEvent e(QEvent::WindowUnblocked);
         QApplication::sendEvent(parent, &e);
     }
 
-    // Due to a bug on Windows Me, we need to reset the current
-    // directory
-    if ((qWinVersion() == Qt::WV_98 || qWinVersion() == Qt::WV_Me) && QDir::currentDirPath() != currentDir)
-        QDir::setCurrent(currentDir);
-
     if (!result.isEmpty())
         result.replace(QLatin1Char('\\'), QLatin1Char('/'));
     return result;
diff --git a/src/qt3support/dialogs/q3tabdialog.cpp b/src/qt3support/dialogs/q3tabdialog.cpp
index 50dbd48436..a65affc47a 100644
--- a/src/qt3support/dialogs/q3tabdialog.cpp
+++ b/src/qt3support/dialogs/q3tabdialog.cpp
@@ -1038,7 +1038,7 @@ QString Q3TabDialog::tabLabel(QWidget * w)
 }
 
 
-/*!  \reimp
+/*!  \internal
 */
 void Q3TabDialog::styleChange(QStyle& s)
 {
diff --git a/src/qt3support/itemviews/q3table.cpp b/src/qt3support/itemviews/q3table.cpp
index 8e6c570ed6..9d1ae978ef 100644
--- a/src/qt3support/itemviews/q3table.cpp
+++ b/src/qt3support/itemviews/q3table.cpp
@@ -6412,7 +6412,7 @@ void Q3Table::startDrag()
 
 #endif
 
-/*! \reimp */
+/*! \internal */
 void Q3Table::windowActivationChange(bool oldActive)
 {
     if (oldActive && autoScrollTimer)
diff --git a/src/qt3support/network/q3dns.cpp b/src/qt3support/network/q3dns.cpp
index b80b76b492..6d514c1693 100644
--- a/src/qt3support/network/q3dns.cpp
+++ b/src/qt3support/network/q3dns.cpp
@@ -2242,53 +2242,31 @@ typedef struct {
 typedef DWORD (WINAPI *GNP)( PFIXED_INFO, PULONG );
 
 // ### FIXME: this code is duplicated in qfiledialog.cpp
-static QString getWindowsRegString( HKEY key, const QString &subKey )
+static QString getWindowsRegString(HKEY key, const QString &subKey)
 {
     QString s;
-    QT_WA( {
-	char buf[1024];
-	DWORD bsz = sizeof(buf);
-	int r = RegQueryValueEx( key, (TCHAR*)subKey.ucs2(), 0, 0, (LPBYTE)buf, &bsz );
-	if ( r == ERROR_SUCCESS ) {
-	    s = QString::fromUcs2( (unsigned short *)buf );
-	} else if ( r == ERROR_MORE_DATA ) {
-	    char *ptr = new char[bsz+1];
-	    r = RegQueryValueEx( key, (TCHAR*)subKey.ucs2(), 0, 0, (LPBYTE)ptr, &bsz );
-	    if ( r == ERROR_SUCCESS )
-		s = QLatin1String(ptr);
-	    delete [] ptr;
-	}
-    } , {
-	char buf[512];
-	DWORD bsz = sizeof(buf);
-	int r = RegQueryValueExA( key, subKey.local8Bit(), 0, 0, (LPBYTE)buf, &bsz );
-	if ( r == ERROR_SUCCESS ) {
-	    s = QLatin1String(buf);
-	} else if ( r == ERROR_MORE_DATA ) {
-	    char *ptr = new char[bsz+1];
-	    r = RegQueryValueExA( key, subKey.local8Bit(), 0, 0, (LPBYTE)ptr, &bsz );
-	    if ( r == ERROR_SUCCESS )
-		s = QLatin1String(ptr);
-	    delete [] ptr;
-	}
-    } );
+
+    wchar_t buf[1024];
+    DWORD bsz = sizeof(buf) / sizeof(wchar_t);
+    int r = RegQueryValueEx(key, (wchar_t*)subKey.utf16(), 0, 0, (LPBYTE)buf, &bsz);
+    if (r == ERROR_SUCCESS) {
+        s = QString::fromWCharArray(buf);
+    } else if (r == ERROR_MORE_DATA) {
+        char *ptr = new char[bsz+1];
+        r = RegQueryValueEx(key, (wchar_t*)subKey.utf16(), 0, 0, (LPBYTE)ptr, &bsz);
+        if (r == ERROR_SUCCESS)
+            s = QLatin1String(ptr);
+        delete [] ptr;
+    }
+
     return s;
 }
 
 static bool getDnsParamsFromRegistry( const QString &path,
-	QString *domainName, QString *nameServer, QString *searchList )
+    QString *domainName, QString *nameServer, QString *searchList )
 {
     HKEY k;
-    int r;
-    QT_WA( {
-	r = RegOpenKeyEx( HKEY_LOCAL_MACHINE,
-			  (TCHAR*)path.ucs2(),
-			  0, KEY_READ, &k );
-    } , {
-	r = RegOpenKeyExA( HKEY_LOCAL_MACHINE,
-			   path.latin1(),
-			   0, KEY_READ, &k );
-    } );
+    int r = RegOpenKeyEx( HKEY_LOCAL_MACHINE, (wchar_t*)path.utf16(), 0, KEY_READ, &k );
 
     if ( r == ERROR_SUCCESS ) {
 	*domainName = getWindowsRegString( k, QLatin1String("DhcpDomain") );
@@ -2321,14 +2299,10 @@ void Q3Dns::doResInit()
     bool gotNetworkParams = false;
     // try the API call GetNetworkParams() first and use registry lookup only
     // as a fallback
-#ifdef Q_OS_WINCE
-    HINSTANCE hinstLib = LoadLibraryW( L"iphlpapi" );
-#else
-    HINSTANCE hinstLib = LoadLibraryA( "iphlpapi" );
-#endif
+    HINSTANCE hinstLib = LoadLibrary( L"iphlpapi" );
     if ( hinstLib != 0 ) {
 #ifdef Q_OS_WINCE
-	GNP getNetworkParams = (GNP) GetProcAddressW( hinstLib, L"GetNetworkParams" );
+	GNP getNetworkParams = (GNP) GetProcAddress( hinstLib, L"GetNetworkParams" );
 #else
 	GNP getNetworkParams = (GNP) GetProcAddress( hinstLib, "GetNetworkParams" );
 #endif
@@ -2362,13 +2336,7 @@ void Q3Dns::doResInit()
 	if ( getDnsParamsFromRegistry(
 	    QLatin1String("System\\CurrentControlSet\\Services\\Tcpip\\Parameters"),
 		    &domainName, &nameServer, &searchList )) {
-	    // for NT
 	    separator = ' ';
-	} else if ( getDnsParamsFromRegistry(
-	    QLatin1String("System\\CurrentControlSet\\Services\\VxD\\MSTCP"),
-		    &domainName, &nameServer, &searchList )) {
-	    // for Windows 98
-	    separator = ',';
 	} else {
 	    // Could not access the TCP/IP parameters
 	    domainName = QLatin1String("");
diff --git a/src/qt3support/network/q3http.cpp b/src/qt3support/network/q3http.cpp
index 59adc27130..dba4e88ce1 100644
--- a/src/qt3support/network/q3http.cpp
+++ b/src/qt3support/network/q3http.cpp
@@ -785,7 +785,7 @@ int Q3HttpResponseHeader::minorVersion() const
     return minVer;
 }
 
-/*! \reimp
+/*! \internal
 */
 bool Q3HttpResponseHeader::parseLine( const QString& line, int number )
 {
@@ -952,7 +952,7 @@ int Q3HttpRequestHeader::minorVersion() const
     return minVer;
 }
 
-/*! \reimp
+/*! \internal
 */
 bool Q3HttpRequestHeader::parseLine( const QString& line, int number )
 {
diff --git a/src/qt3support/network/q3socketdevice_win.cpp b/src/qt3support/network/q3socketdevice_win.cpp
index 926d6999e8..a0f0c0f5c4 100644
--- a/src/qt3support/network/q3socketdevice_win.cpp
+++ b/src/qt3support/network/q3socketdevice_win.cpp
@@ -47,20 +47,15 @@
 
 #include <string.h>
 
+#  include <qt_windows.h>
 #if defined (QT_NO_IPV6)
-#  include <windows.h>
 #  include <winsock.h>
 #else
 #  if defined (Q_CC_BOR) || defined (Q_CC_GNU)
 #    include <winsock2.h>
-#  elif defined (Q_CC_INTEL)
-#    include <winsock.h>
 #  else
-#    include <windows.h>
-#  if defined(Q_OS_WINCE)
 #    include <winsock.h>
 #  endif
-#  endif
 // Use our own defines and structs which we know are correct
 #  define QT_SS_MAXSIZE 128
 #  define QT_SS_ALIGNSIZE (sizeof(__int64))
diff --git a/src/qt3support/other/q3dragobject.cpp b/src/qt3support/other/q3dragobject.cpp
index 0c17e0ca48..93a6079b91 100644
--- a/src/qt3support/other/q3dragobject.cpp
+++ b/src/qt3support/other/q3dragobject.cpp
@@ -191,8 +191,7 @@ Q3DragObject::~Q3DragObject()
     Set the pixmap, \a pm, to display while dragging the object. The
     platform-specific implementation will use this where it can - so
     provide a small masked pixmap, and do not assume that the user
-    will actually see it. For example, cursors on Windows 95 are of
-    limited size.
+    will actually see it.
 
     The \a hotspot is the point on (or off) the pixmap that should be
     under the cursor as it is dragged. It is relative to the top-left
@@ -553,10 +552,6 @@ QTextCodec* qt_findcharset(const QByteArray& mimetype)
         i = cs.indexOf(';');
         if (i >= 0)
             cs = cs.left(i);
-        // win98 often has charset=utf16, and we need to get the correct codec for
-        // it to be able to get Unicode text drops.
-        if (cs == "utf16")
-            cs = "ISO-10646-UCS-2";
         // May return 0 if unknown charset
         return QTextCodec::codecForName(cs);
     }
diff --git a/src/qt3support/other/q3process_win.cpp b/src/qt3support/other/q3process_win.cpp
index 352e497e88..0952663bd0 100644
--- a/src/qt3support/other/q3process_win.cpp
+++ b/src/qt3support/other/q3process_win.cpp
@@ -308,108 +308,60 @@ bool Q3Process::start( QStringList *env )
     // CreateProcess()
     bool success;
     d->newPid();
-#ifdef UNICODE
-    if (!(QSysInfo::WindowsVersion & QSysInfo::WV_DOS_based)) {
-	STARTUPINFOW startupInfo = {
-	    sizeof( STARTUPINFO ), 0, 0, 0,
-	    (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
-	    0, 0, 0,
-	    STARTF_USESTDHANDLES,
-	    0, 0, 0,
-	    d->pipeStdin[0], d->pipeStdout[1], d->pipeStderr[1]
-	};
-	TCHAR *applicationName;
-	if ( appName.isNull() )
-	    applicationName = 0;
-	else
-	    applicationName = _wcsdup( (TCHAR*)appName.ucs2() );
-	TCHAR *commandLine = _wcsdup( (TCHAR*)args.ucs2() );
-	QByteArray envlist;
-	if ( env != 0 ) {
-	    int pos = 0;
-	    // add PATH if necessary (for DLL loading)
-	    QByteArray path = qgetenv( "PATH" );
-	    if ( env->grep( QRegExp(QLatin1String("^PATH="),FALSE) ).empty() && !path.isNull() ) {
-        QString tmp = QString::fromLatin1("PATH=%1").arg(QLatin1String(path.constData()));
-		uint tmpSize = sizeof(TCHAR) * (tmp.length()+1);
-		envlist.resize( envlist.size() + tmpSize );
-		memcpy( envlist.data()+pos, tmp.ucs2(), tmpSize );
-		pos += tmpSize;
-	    }
-	    // add the user environment
-	    for ( QStringList::Iterator it = env->begin(); it != env->end(); it++ ) {
-		QString tmp = *it;
-		uint tmpSize = sizeof(TCHAR) * (tmp.length()+1);
-		envlist.resize( envlist.size() + tmpSize );
-		memcpy( envlist.data()+pos, tmp.ucs2(), tmpSize );
-		pos += tmpSize;
-	    }
-	    // add the 2 terminating 0 (actually 4, just to be on the safe side)
-	    envlist.resize( envlist.size()+4 );
-	    envlist[pos++] = 0;
-	    envlist[pos++] = 0;
-	    envlist[pos++] = 0;
-	    envlist[pos++] = 0;
-	}
-	success = CreateProcessW( applicationName, commandLine,
-		0, 0, TRUE, ( comms==0 ? CREATE_NEW_CONSOLE : CREATE_NO_WINDOW )
+
+    STARTUPINFOW startupInfo = {
+        sizeof( STARTUPINFO ), 0, 0, 0,
+        (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
+        0, 0, 0,
+        STARTF_USESTDHANDLES,
+        0, 0, 0,
+        d->pipeStdin[0], d->pipeStdout[1], d->pipeStderr[1]
+    };
+    wchar_t *applicationName;
+    if ( appName.isNull() )
+        applicationName = 0;
+    else
+        applicationName = _wcsdup( (wchar_t*)appName.utf16() );
+    wchar_t *commandLine = _wcsdup( (wchar_t*)args.utf16() );
+    QByteArray envlist;
+    if ( env != 0 ) {
+        int pos = 0;
+        // add PATH if necessary (for DLL loading)
+        QByteArray path = qgetenv( "PATH" );
+        if ( env->grep( QRegExp(QLatin1String("^PATH="),FALSE) ).empty() && !path.isNull() ) {
+            QString tmp = QString::fromLatin1("PATH=%1").arg(QLatin1String(path.constData()));
+            uint tmpSize = sizeof(wchar_t) * (tmp.length() + 1);
+            envlist.resize( envlist.size() + tmpSize );
+            memcpy( envlist.data() + pos, tmp.utf16(), tmpSize );
+            pos += tmpSize;
+        }
+        // add the user environment
+        for ( QStringList::Iterator it = env->begin(); it != env->end(); it++ ) {
+            QString tmp = *it;
+            uint tmpSize = sizeof(wchar_t) * (tmp.length() + 1);
+            envlist.resize( envlist.size() + tmpSize );
+            memcpy( envlist.data() + pos, tmp.utf16(), tmpSize );
+            pos += tmpSize;
+        }
+        // add the 2 terminating 0 (actually 4, just to be on the safe side)
+        envlist.resize( envlist.size()+4 );
+        envlist[pos++] = 0;
+        envlist[pos++] = 0;
+        envlist[pos++] = 0;
+        envlist[pos++] = 0;
+    }
+    success = CreateProcess( applicationName, commandLine,
+                            0, 0, TRUE, ( comms == 0 ? CREATE_NEW_CONSOLE : CREATE_NO_WINDOW )
 #ifndef Q_OS_WINCE
-		| CREATE_UNICODE_ENVIRONMENT
+                            | CREATE_UNICODE_ENVIRONMENT
 #endif
-		, env==0 ? 0 : envlist.data(),
-                (TCHAR*)QDir::toNativeSeparators(workingDir.absPath()).ucs2(),
-		&startupInfo, d->pid );
-	free( applicationName );
-	free( commandLine );
-    } else
-#endif // UNICODE
-    {
-#ifndef Q_OS_WINCE
-	STARTUPINFOA startupInfo = { sizeof( STARTUPINFOA ), 0, 0, 0,
-	    (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT, (ulong)CW_USEDEFAULT,
-	    0, 0, 0,
-	    STARTF_USESTDHANDLES,
-	    0, 0, 0,
-	    d->pipeStdin[0], d->pipeStdout[1], d->pipeStderr[1]
-	};
-	QByteArray envlist;
-	if ( env != 0 ) {
-	    int pos = 0;
-	    // add PATH if necessary (for DLL loading)
-	    QByteArray path = qgetenv( "PATH" );
-	    if ( env->grep( QRegExp(QLatin1String("^PATH="),FALSE) ).empty() && !path.isNull() ) {
-            Q3CString tmp = QString::fromLatin1("PATH=%1").arg(QString::fromLatin1(path.constData())).local8Bit();
-		uint tmpSize = tmp.length() + 1;
-		envlist.resize( envlist.size() + tmpSize );
-		memcpy( envlist.data()+pos, tmp.data(), tmpSize );
-		pos += tmpSize;
-	    }
-	    // add the user environment
-	    for ( QStringList::Iterator it = env->begin(); it != env->end(); it++ ) {
-		Q3CString tmp = (*it).local8Bit();
-		uint tmpSize = tmp.length() + 1;
-		envlist.resize( envlist.size() + tmpSize );
-		memcpy( envlist.data()+pos, tmp.data(), tmpSize );
-		pos += tmpSize;
-	    }
-	    // add the terminating 0 (actually 2, just to be on the safe side)
-	    envlist.resize( envlist.size()+2 );
-	    envlist[pos++] = 0;
-	    envlist[pos++] = 0;
-	}
-	char *applicationName;
-	if ( appName.isNull() )
-	    applicationName = 0;
-	else
-	    applicationName = const_cast<char *>(appName.toLocal8Bit().data());
-	success = CreateProcessA( applicationName,
-		const_cast<char *>(args.toLocal8Bit().data()),
-		0, 0, TRUE, comms==0 ? CREATE_NEW_CONSOLE : DETACHED_PROCESS,
-		env==0 ? 0 : envlist.data(),
-                (const char*)QDir::toNativeSeparators(workingDir.absPath()).local8Bit(),
-		&startupInfo, d->pid );
-#endif // Q_OS_WINCE
-    }
+                            , env == 0 ? 0 : envlist.data(),
+                            (wchar_t*)QDir::toNativeSeparators(workingDir.absPath()).utf16(),
+                            &startupInfo, d->pid );
+
+    free( applicationName );
+    free( commandLine );
+
     if  ( !success ) {
 	d->deletePid();
 	return false;
diff --git a/src/qt3support/sql/q3datatable.cpp b/src/qt3support/sql/q3datatable.cpp
index 638aff8896..d8d3c2bd14 100644
--- a/src/qt3support/sql/q3datatable.cpp
+++ b/src/qt3support/sql/q3datatable.cpp
@@ -1726,8 +1726,6 @@ void Q3DataTable::repaintCell( int row, int col )
     the content coordinate system. If \a selected is true the cell has
     been selected and would normally be rendered differently than an
     unselected cell.
-
-    \sa QSql::isNull()
 */
 
 void Q3DataTable::paintCell( QPainter * p, int row, int col, const QRect & cr,
diff --git a/src/qt3support/tools/q3cstring.cpp b/src/qt3support/tools/q3cstring.cpp
index 39f1c43847..b33b9b6c77 100644
--- a/src/qt3support/tools/q3cstring.cpp
+++ b/src/qt3support/tools/q3cstring.cpp
@@ -77,11 +77,23 @@ QT_BEGIN_NAMESPACE
     and '\0' (NUL byte) terminated; otherwise the results are
     undefined.
 
-    A Q3CString that has not been assigned to anything is \e null, i.e.
-    both the length and the data pointer is 0. A Q3CString that
-    references the empty string ("", a single '\0' char) is \e empty.
-    Both null and empty Q3CStrings are legal parameters to the methods.
-    Assigning \c{const char *} 0 to Q3CString produces a null Q3CString.
+    A default constructed Q3CString is \e null, i.e. both the length
+    and the data pointer are 0 and isNull() returns true.
+    
+    \note However, if you ask for the data pointer of a null Q3CString
+    by calling data(), then because the internal representation of the
+    null Q3CString is shared, it will be detached and replaced with a
+    non-shared, empty representation, a non-null data pointer will be
+    returned, and subsequent calls to isNull() will return false. But
+    if you ask for the data pointer of a null Q3CString by calling
+    constData(), the shared internal representation is not detached, a
+    null data pointer is returned, and subsequent calls to isNull()
+    will continue to return true.
+
+    A Q3CString that references the empty string ("", a single '\0'
+    char) is \e empty, i.e. isEmpty() returns true.  Both null and
+    empty Q3CStrings are legal parameters to the methods.  Assigning
+    \c{const char *} 0 to Q3CString produces a null Q3CString.
 
     The length() function returns the length of the string; resize()
     resizes the string and truncate() truncates the string. A string
@@ -321,6 +333,16 @@ QT_BEGIN_NAMESPACE
     Returns true if the string is null, i.e. if data() == 0; otherwise
     returns false. A null string is also an empty string.
 
+    \note If you ask for the data pointer of a null Q3CString by
+    calling data(), then because the internal representation of the
+    null Q3CString is shared, it will be detached and replaced with a
+    non-shared, empty representation, a non-null data pointer will be
+    returned, and subsequent calls to isNull() will return false. But
+    if you ask for the data pointer of a null Q3CString by calling
+    constData(), the shared internal representation is not detached, a
+    null data pointer is returned, and subsequent calls to isNull()
+    will continue to return true.
+
     Example:
     \snippet doc/src/snippets/code/src.qt3support.tools.q3cstring.cpp 1
 
diff --git a/src/qt3support/widgets/q3datetimeedit.cpp b/src/qt3support/widgets/q3datetimeedit.cpp
index b6e303cfbc..71a8ffdc77 100644
--- a/src/qt3support/widgets/q3datetimeedit.cpp
+++ b/src/qt3support/widgets/q3datetimeedit.cpp
@@ -114,39 +114,21 @@ static void readLocaleSettings()
     lTimeSep = new QString();
 
 #if defined(Q_WS_WIN)
-    QT_WA({
-        TCHAR data[10];
-        GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDATE, data, 10);
-        *lDateSep = QString::fromUtf16((ushort*)data);
-        GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIME, data, 10);
-        *lTimeSep = QString::fromUtf16((ushort*)data);
-        GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ITIME, data, 10);
-        lAMPM = QString::fromUtf16((ushort*)data).toInt()==0;
-        GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S1159, data, 10);
-        QString am = QString::fromUtf16((ushort*)data);
-        if (!am.isEmpty())
-            lAM = new QString(am);
-        GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S2359, data, 10);
-        QString pm = QString::fromUtf16((ushort*)data);
-        if (!pm.isEmpty() )
-            lPM = new QString(pm);
-    } , {
-        char data[10];
-        GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_SDATE, (char*)&data, 10);
-        *lDateSep = QString::fromLocal8Bit(data);
-        GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_STIME, (char*)&data, 10);
-        *lTimeSep = QString::fromLocal8Bit(data);
-        GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_ITIME, (char*)&data, 10);
-        lAMPM = QString::fromLocal8Bit(data).toInt()==0;
-        GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_S1159, (char*)&data, 10);
-        QString am = QString::fromLocal8Bit(data);
-        if (!am.isEmpty())
-            lAM = new QString(am);
-        GetLocaleInfoA(LOCALE_USER_DEFAULT, LOCALE_S2359, (char*)&data, 10);
-        QString pm = QString::fromLocal8Bit(data);
-        if (!pm.isEmpty())
-            lPM = new QString(pm);
-    });
+    wchar_t data[10];
+    GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_SDATE, data, 10);
+    *lDateSep = QString::fromWCharArray(data);
+    GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_STIME, data, 10);
+    *lTimeSep = QString::fromWCharArray(data);
+    GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_ITIME, data, 10);
+    lAMPM = QString::fromWCharArray(data).toInt() == 0;
+    GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S1159, data, 10);
+    QString am = QString::fromWCharArray(data);
+    if (!am.isEmpty())
+        lAM = new QString(am);
+    GetLocaleInfo(LOCALE_USER_DEFAULT, LOCALE_S2359, data, 10);
+    QString pm = QString::fromWCharArray(data);
+    if (!pm.isEmpty() )
+        lPM = new QString(pm);
 #else
     *lDateSep = QLatin1Char('-');
     *lTimeSep = QLatin1Char(':');
@@ -1262,7 +1244,7 @@ Q3DateEdit::Order Q3DateEdit::order() const
 }
 
 
-/*! \reimp
+/*! \internal
 
 */
 void Q3DateEdit::stepUp()
@@ -1294,7 +1276,7 @@ void Q3DateEdit::stepUp()
 
 
 
-/*! \reimp
+/*! \internal
 
 */
 
@@ -1458,7 +1440,7 @@ bool Q3DateEdit::outOfRange(int y, int m, int d) const
     return false; /* assume ok */
 }
 
-/*!  \reimp
+/*!  \internal
 
 */
 
@@ -1552,7 +1534,7 @@ void Q3DateEdit::addNumber(int sec, int num)
 }
 
 
-/*! \reimp
+/*! \internal
 
 */
 
@@ -1699,7 +1681,7 @@ void Q3DateEdit::removeFirstNumber(int sec)
     d->ed->repaint(d->ed->rect());
 }
 
-/*! \reimp
+/*! \internal
 
 */
 
@@ -2077,7 +2059,7 @@ void Q3TimeEdit::timerEvent(QTimerEvent *)
 }
 
 
-/*! \reimp
+/*! \internal
 
 */
 
@@ -2123,7 +2105,7 @@ void Q3TimeEdit::stepUp()
 }
 
 
-/*! \reimp
+/*! \internal
 
 */
 
@@ -2191,7 +2173,7 @@ QString Q3TimeEdit::sectionFormattedText(int sec)
 }
 
 
-/*! \reimp
+/*! \internal
 
 */
 
@@ -2326,7 +2308,7 @@ bool Q3TimeEdit::outOfRange(int h, int m, int s) const
     return true;
 }
 
-/*! \reimp
+/*! \internal
 
 */
 
@@ -2495,7 +2477,7 @@ void Q3TimeEdit::removeFirstNumber(int sec)
     d->ed->repaint(d->ed->rect());
 }
 
-/*! \reimp
+/*! \internal
 
 */
 void Q3TimeEdit::removeLastNumber(int sec)
@@ -2666,13 +2648,12 @@ Q3DateTimeEdit::~Q3DateTimeEdit()
 }
 
 
-/*!
+/*! \fn void Q3DateTimeEdit::resizeEvent(QResizeEvent *event)
     \reimp
 
-    Intercepts and handles resize events which have special meaning
-    for the Q3DateTimeEdit.
+    Intercepts and handles the resize \a event, which hase a
+    special meaning for the Q3DateTimeEdit.
 */
-
 void Q3DateTimeEdit::resizeEvent(QResizeEvent *)
 {
     int dw = de->sizeHint().width();
diff --git a/src/qt3support/widgets/q3dockarea.cpp b/src/qt3support/widgets/q3dockarea.cpp
index a00bc81a49..d76835ab77 100644
--- a/src/qt3support/widgets/q3dockarea.cpp
+++ b/src/qt3support/widgets/q3dockarea.cpp
@@ -473,24 +473,25 @@ int Q3DockAreaLayout::widthForHeight(int h) const
     contain Q3ToolBars since Q3ToolBar is a Q3DockWindow subclass.
 
     QMainWindow contains four Q3DockAreas which you can use for your
-    Q3ToolBars and Q3DockWindows, so in most situations you do not need
-    to use the Q3DockArea class directly. Although QMainWindow contains
-    support for its own dock areas it isn't convenient for adding new
-    Q3DockAreas. If you need to create your own dock areas we suggest
-    that you create a subclass of QWidget and add your Q3DockAreas to
-    your subclass.
+    Q3ToolBars and Q3DockWindows, so in most situations you do not
+    need to use the Q3DockArea class directly. Although QMainWindow
+    contains support for its own dock areas, you can't add new ones.
+    You also can't add a Q3DockArea to your own subclass of QWidget.
+    It won't be shown.
 
     \img qmainwindow-qdockareas.png QMainWindow's Q3DockAreas
 
     \target lines
-    \e Lines. Q3DockArea uses the concept of lines. A line is a
-    horizontal region which may contain dock windows side-by-side. A
-    dock area may have room for more than one line. When dock windows
-    are docked into a dock area they are usually added at the right
-    hand side of the top-most line that has room (unless manually
-    placed by the user). When users move dock windows they may leave
-    empty lines or gaps in non-empty lines. Qt::Dock windows can be lined
-    up to minimize wasted space using the lineUp() function.
+    \section1 Lines.
+
+    Q3DockArea uses the concept of lines. A line is a horizontal
+    region which may contain dock windows side-by-side. A dock area
+    may have room for more than one line. When dock windows are docked
+    into a dock area they are usually added at the right hand side of
+    the top-most line that has room (unless manually placed by the
+    user). When users move dock windows they may leave empty lines or
+    gaps in non-empty lines. Qt::Dock windows can be lined up to
+    minimize wasted space using the lineUp() function.
 
     The Q3DockArea class maintains a position list of all its child
     dock windows. Qt::Dock windows are added to a dock area from position
diff --git a/src/qt3support/widgets/q3scrollview.cpp b/src/qt3support/widgets/q3scrollview.cpp
index cea385a54d..95e2117e03 100644
--- a/src/qt3support/widgets/q3scrollview.cpp
+++ b/src/qt3support/widgets/q3scrollview.cpp
@@ -669,7 +669,7 @@ bool Q3ScrollView::isVerticalSliderPressed()
 }
 
 /*!
-    \reimp
+    \internal
 */
 void Q3ScrollView::styleChange(QStyle& old)
 {
@@ -679,7 +679,7 @@ void Q3ScrollView::styleChange(QStyle& old)
 }
 
 /*!
-    \reimp
+    \internal
 */
 void Q3ScrollView::fontChange(const QFont &old)
 {
diff --git a/src/qt3support/widgets/q3titlebar.cpp b/src/qt3support/widgets/q3titlebar.cpp
index a05e4e5e15..ee3decfd73 100644
--- a/src/qt3support/widgets/q3titlebar.cpp
+++ b/src/qt3support/widgets/q3titlebar.cpp
@@ -173,35 +173,20 @@ void Q3TitleBarPrivate::readColors()
     bool colorsInitialized = false;
 
 #ifdef Q_WS_WIN // ask system properties on windows
-#ifndef SPI_GETGRADIENTCAPTIONS
-#define SPI_GETGRADIENTCAPTIONS 0x1008
-#endif
-#ifndef COLOR_GRADIENTACTIVECAPTION
-#define COLOR_GRADIENTACTIVECAPTION 27
-#endif
-#ifndef COLOR_GRADIENTINACTIVECAPTION
-#define COLOR_GRADIENTINACTIVECAPTION 28
-#endif
     if (QApplication::desktopSettingsAware()) {
         pal.setColor(QPalette::Active, QPalette::Highlight, colorref2qrgb(GetSysColor(COLOR_ACTIVECAPTION)));
         pal.setColor(QPalette::Inactive, QPalette::Highlight, colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTION)));
         pal.setColor(QPalette::Active, QPalette::HighlightedText, colorref2qrgb(GetSysColor(COLOR_CAPTIONTEXT)));
         pal.setColor(QPalette::Inactive, QPalette::HighlightedText, colorref2qrgb(GetSysColor(COLOR_INACTIVECAPTIONTEXT)));
-        if (QSysInfo::WindowsVersion != QSysInfo::WV_95 && QSysInfo::WindowsVersion != QSysInfo::WV_NT) {
-            colorsInitialized = true;
-            BOOL gradient;
-            QT_WA({
-                SystemParametersInfo(SPI_GETGRADIENTCAPTIONS, 0, &gradient, 0);
-            } , {
-                SystemParametersInfoA(SPI_GETGRADIENTCAPTIONS, 0, &gradient, 0);
-            });
-            if (gradient) {
-                pal.setColor(QPalette::Active, QPalette::Base, colorref2qrgb(GetSysColor(COLOR_GRADIENTACTIVECAPTION)));
-                pal.setColor(QPalette::Inactive, QPalette::Base, colorref2qrgb(GetSysColor(COLOR_GRADIENTINACTIVECAPTION)));
-            } else {
-                pal.setColor(QPalette::Active, QPalette::Base, pal.color(QPalette::Active, QPalette::Highlight));
-                pal.setColor(QPalette::Inactive, QPalette::Base, pal.color(QPalette::Inactive, QPalette::Highlight));
-            }
+        colorsInitialized = true;
+        BOOL gradient = false;
+        SystemParametersInfo(SPI_GETGRADIENTCAPTIONS, 0, &gradient, 0);
+        if (gradient) {
+            pal.setColor(QPalette::Active, QPalette::Base, colorref2qrgb(GetSysColor(COLOR_GRADIENTACTIVECAPTION)));
+            pal.setColor(QPalette::Inactive, QPalette::Base, colorref2qrgb(GetSysColor(COLOR_GRADIENTINACTIVECAPTION)));
+        } else {
+            pal.setColor(QPalette::Active, QPalette::Base, pal.color(QPalette::Active, QPalette::Highlight));
+            pal.setColor(QPalette::Inactive, QPalette::Base, pal.color(QPalette::Inactive, QPalette::Highlight));
         }
     }
 #endif // Q_WS_WIN