Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration

* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
  Updated WebKit from /home/shausman/src/webkit/trunk to qtwebkit/qtwebkit-4.6 ( de77f8ee69c434bde9306c8f407ee2e443a00188 )
  Drag and drop icon not updated correctly in Cocoa.
  Adding missing file.
  Warn when calling QFileInfo::absolutePath() on an improper object.
  update harfbuzz to 2b78f0d78ad3075fd1657d1260b31219e1a5155
  Fixing a problem with xmlpatterns, where code from tools/xmlpatterns was being included by src/xmlpatterns.
  Fix for WinCE compilation of QAbstractSpinBox.

23 files changed, 290 insertions, 115 deletions

diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c b/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c
index 2bda386..67029be 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-hebrew.c
@@ -56,8 +56,6 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
 
     assert(shaper_item->item.script == HB_Script_Hebrew);
 
-    HB_HeuristicSetGlyphAttributes(shaper_item);
-
 #ifndef NO_OPENTYPE
     if (HB_SelectScript(shaper_item, hebrew_features)) {
 
@@ -65,7 +63,7 @@ HB_Bool HB_HebrewShape(HB_ShaperItem *shaper_item)
         if (!HB_ConvertStringToGlyphIndices(shaper_item))
             return FALSE;
 
-
+        HB_HeuristicSetGlyphAttributes(shaper_item);
         HB_OpenTypeShape(shaper_item, /*properties*/0);
         return HB_OpenTypePosition(shaper_item, availableGlyphs, /*doLogClusters*/TRUE);
     }
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
index bfb03ab..bfc7bd4 100644
--- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
+++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp
@@ -980,6 +980,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
     HB_Stream gdefStream;
 
     gdefStream = getTableStream(font, tableFunc, TTAG_GDEF);
+    error = HB_Err_Not_Covered;
     if (!gdefStream || (error = HB_Load_GDEF_Table(gdefStream, &face->gdef))) {
         //DEBUG("error loading gdef table: %d", error);
         face->gdef = 0;
@@ -987,6 +988,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
 
     //DEBUG() << "trying to load gsub table";
     stream = getTableStream(font, tableFunc, TTAG_GSUB);
+    error = HB_Err_Not_Covered;
     if (!stream || (error = HB_Load_GSUB_Table(stream, &face->gsub, face->gdef, gdefStream))) {
         face->gsub = 0;
         if (error != HB_Err_Not_Covered) {
@@ -998,6 +1000,7 @@ HB_Face HB_NewFace(void *font, HB_GetFontTableFunc tableFunc)
     _hb_close_stream(stream);
 
     stream = getTableStream(font, tableFunc, TTAG_GPOS);
+    error = HB_Err_Not_Covered;
     if (!stream || (error = HB_Load_GPOS_Table(stream, &face->gpos, face->gdef, gdefStream))) {
         face->gpos = 0;
         DEBUG("error loading gpos table: %d", error);
diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION
index 62acbdf..e6813a1 100644
--- a/src/3rdparty/webkit/VERSION
+++ b/src/3rdparty/webkit/VERSION
@@ -8,4 +8,4 @@ The commit imported was from the
 
 and has the sha1 checksum
 
-        9de63cde0ac8aa08e207d4ffce2846df1a44a364
+        de77f8ee69c434bde9306c8f407ee2e443a00188
diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog
index 4f6146f..c60a5d4 100644
--- a/src/3rdparty/webkit/WebCore/ChangeLog
+++ b/src/3rdparty/webkit/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-21  Andreas Kling  <andreas.kling@nokia.com>
+
+        Reviewed by Darin Adler.
+
+        Fix assertion failure when dragging an SVG image.
+        https://bugs.webkit.org/show_bug.cgi?id=32511
+
+        Test: fast/images/drag-svg-as-image.html
+
+        * svg/graphics/SVGImage.cpp:
+        (WebCore::SVGImage::filenameExtension): Return "svg"
+        * svg/graphics/SVGImage.h:
+
 2009-11-23  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.cpp b/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.cpp
index 0a506f8..b74e912 100644
--- a/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.cpp
+++ b/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.cpp
@@ -267,6 +267,11 @@ bool SVGImage::dataChanged(bool allDataReceived)
     return m_page;
 }
 
+String SVGImage::filenameExtension() const
+{
+    return "svg";
+}
+
 }
 
 #endif // ENABLE(SVG)
diff --git a/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.h b/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.h
index 2cea91a..0f05429 100644
--- a/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.h
+++ b/src/3rdparty/webkit/WebCore/svg/graphics/SVGImage.h
@@ -47,6 +47,8 @@ namespace WebCore {
     private:
         virtual ~SVGImage();
 
+        virtual String filenameExtension() const;
+
         virtual void setContainerSize(const IntSize&);
         virtual bool usesContainerSize() const;
         virtual bool hasRelativeWidth() const;
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebinspector.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebinspector.cpp
index f43cbbf..1145744 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebinspector.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebinspector.cpp
@@ -139,6 +139,9 @@ QSize QWebInspector::sizeHint() const
 /*! \reimp */
 bool QWebInspector::event(QEvent* ev)
 {
+    if (ev->type() == QEvent::Close && d->page)
+        d->page->d->inspectorController()->setWindowVisible(false);
+
     return QWidget::event(ev);
 }
 
@@ -159,8 +162,6 @@ void QWebInspector::showEvent(QShowEvent* event)
 /*! \reimp */
 void QWebInspector::hideEvent(QHideEvent* event)
 {
-    if (d->page)
-        d->page->d->inspectorController()->setWindowVisible(false);
 }
 
 /*! \internal */
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
index 88b7271..35f6e0c 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp
@@ -3080,7 +3080,7 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
     Q_UNUSED(url)
     QString ua = QLatin1String("Mozilla/5.0 ("
 
-    // Plastform
+    // Platform
 #ifdef Q_WS_MAC
     "Macintosh"
 #elif defined Q_WS_QWS
@@ -3089,19 +3089,22 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
     "Windows"
 #elif defined Q_WS_X11
     "X11"
+#elif defined Q_OS_SYMBIAN
+    "SymbianOS"
 #else
     "Unknown"
 #endif
-    "; "
+    // Placeholder for Platform Version
+    "%1; "
 
     // Placeholder for security strength (N or U)
-    "%1; "
+    "%2; "
 
     // Subplatform"
 #ifdef Q_OS_AIX
     "AIX"
 #elif defined Q_OS_WIN32
-    "%2"
+    "%3"
 #elif defined Q_OS_DARWIN
 #ifdef __i386__ || __x86_64__
     "Intel Mac OS X"
@@ -3153,6 +3156,8 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
     "Sun Solaris"
 #elif defined Q_OS_ULTRIX
     "DEC Ultrix"
+#elif defined Q_WS_S60
+    "Series60"
 #elif defined Q_OS_UNIX
     "UNIX BSD/SYSV system"
 #elif defined Q_OS_UNIXWARE
@@ -3160,7 +3165,28 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
 #else
     "Unknown"
 #endif
-    "; ");
+    // Placeholder for SubPlatform Version
+    "%4; ");
+
+    // Platform Version
+    QString osVer;
+#ifdef Q_OS_SYMBIAN
+    QSysInfo::SymbianVersion symbianVersion = QSysInfo::symbianVersion();
+    switch (symbianVersion) {
+    case QSysInfo::SV_9_2:
+        osVer = "/9.2";
+        break;
+    case QSysInfo::SV_9_3:
+        osVer = "/9.3";
+        break;
+    case QSysInfo::SV_9_4:
+        osVer = "/9.4";
+        break;
+    default: 
+        osVer = "Unknown";
+    }
+#endif
+    ua = ua.arg(osVer);
 
     QChar securityStrength(QLatin1Char('N'));
 #if !defined(QT_NO_OPENSSL)
@@ -3224,6 +3250,26 @@ QString QWebPage::userAgentForUrl(const QUrl& url) const
     ua = QString(ua).arg(ver);
 #endif
 
+    // SubPlatform Version
+    QString subPlatformVer;
+#ifdef Q_OS_SYMBIAN
+    QSysInfo::S60Version s60Version = QSysInfo::s60Version();
+    switch (s60Version) {
+    case QSysInfo::SV_S60_3_1:
+        subPlatformVer = "/3.1";
+        break;
+    case QSysInfo::SV_S60_3_2:
+        subPlatformVer = "/3.2";
+        break;
+    case QSysInfo::SV_S60_5_0:
+        subPlatformVer = "/5.0";
+        break;
+    default: 
+        subPlatformVer = " Unknown";
+    }
+#endif
+    ua = ua.arg(subPlatformVer);
+
     // Language
     QLocale locale;
     if (view())
diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
index e9c1ec8..0f79c70 100644
--- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
+++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.h
@@ -51,12 +51,7 @@ class QWEBKIT_EXPORT QWebView : public QWidget {
     Q_PROPERTY(qreal textSizeMultiplier READ textSizeMultiplier WRITE setTextSizeMultiplier DESIGNABLE false)
     Q_PROPERTY(qreal zoomFactor READ zoomFactor WRITE setZoomFactor)
 
-// FIXME: temporary work around for elftran issue that it couldn't find the QPainter::staticMetaObject
-// symbol from Qt lib; it should be reverted after the right symbol is exported.  
-// See bug: http://qt.nokia.com/developer/task-tracker/index_html?method=entry&id=258893
-#if defined(Q_QDOC) || !defined(Q_OS_SYMBIAN)
     Q_PROPERTY(QPainter::RenderHints renderHints READ renderHints WRITE setRenderHints)
-#endif
     Q_FLAGS(QPainter::RenderHints)
 public:
     explicit QWebView(QWidget* parent = 0);
diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog
index 2f0bf17..37d527fa 100644
--- a/src/3rdparty/webkit/WebKit/qt/ChangeLog
+++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog
@@ -1,3 +1,53 @@
+2009-12-21  David Boddie  <dboddie@trolltech.com>
+
+        Reviewed by Simon Hausmann.
+
+        Doc: Minor fixes to language.
+
+        * Api/qwebpage.cpp:
+
+2009-12-15  Holger Hans Peter Freyther  <zecke@selfish.org>
+
+        Reviewed by NOBODY (OOPS!).
+
+        [Qt] Do not disable the inspector on show and hide
+        https://bugs.webkit.org/show_bug.cgi?id=31851
+
+        On Qt/X11 with some window managers the window will be
+        hidden when switching windows. In this case all the results
+        are gone when coming back to the window.
+
+        Attempt to use the CloseEvent to figure out if the window
+        was closed and withdrawn as this is more friendly to the
+        user of the inspector client.
+
+        * Api/qwebinspector.cpp:
+        (QWebInspector::event):
+        (QWebInspector::hideEvent):
+
+2009-12-13  Simon Hausmann  <hausmann@webkit.org>
+
+        Reviewed by Holger Freyther.
+
+        [Qt] Re-enable QWebView::renderHints property for Qt for Symbian
+
+        https://bugs.webkit.org/show_bug.cgi?id=28273
+
+        The bug in Qt's moc that triggered a linking error when declaring this
+        property has been fixed and we can remove the workaround.
+
+        * Api/qwebview.h:
+
+2009-11-30  Abhinav Mithal  <abhinav.mithal@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt][Symbian] Report SymbianOS in user agent string for Symbian
+        https://bugs.webkit.org/show_bug.cgi?id=31961
+
+        * Api/qwebpage.cpp:
+        (QWebPage::userAgentForUrl):
+
 2009-11-28  Simon Hausmann  <simon.hausmann@nokia.com>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/src/corelib/io/qfileinfo.cpp b/src/corelib/io/qfileinfo.cpp
index 61081a1..0a435b9 100644
--- a/src/corelib/io/qfileinfo.cpp
+++ b/src/corelib/io/qfileinfo.cpp
@@ -573,6 +573,8 @@ QString QFileInfo::canonicalFilePath() const
 QString QFileInfo::absolutePath() const
 {
     Q_D(const QFileInfo);
+    if (d->data->fileName.isEmpty())
+        qWarning("QFileInfo::absolutePath: Constructed with empty filename");
     if(!d->data->fileEngine)
         return QLatin1String("");
     return d->getFileName(QAbstractFileEngine::AbsolutePathName);
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index 6c06746..3352dbd 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -349,7 +349,9 @@ extern "C" {
             // since we accepted the drag enter event, the widget expects
             // future drage move events.
             // ### check if we need to treat this like the drag enter event.
-            nsActions = QT_PREPEND_NAMESPACE(qt_mac_mapDropAction)(qDEEvent.dropAction());
+            nsActions = NSDragOperationNone;
+            // Save as ignored in the answer rect.
+            qDMEvent.setDropAction(Qt::IgnoreAction);
         } else {
             nsActions = QT_PREPEND_NAMESPACE(qt_mac_mapDropAction)(qDMEvent.dropAction());
         }
@@ -357,7 +359,6 @@ extern "C" {
         return nsActions;
     }
  }
-
 - (NSDragOperation)draggingUpdated:(id < NSDraggingInfo >)sender
 {
     NSPoint windowPoint = [sender draggingLocation];
@@ -402,13 +403,15 @@ extern "C" {
     qDMEvent.setDropAction(QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).lastAction);
     qDMEvent.accept();
     QApplication::sendEvent(qwidget, &qDMEvent);
-    qt_mac_copy_answer_rect(qDMEvent);
 
     NSDragOperation operation = qt_mac_mapDropAction(qDMEvent.dropAction());
     if (!qDMEvent.isAccepted() || qDMEvent.dropAction() == Qt::IgnoreAction) {
         // ignore this event (we will still receive further notifications)
         operation = NSDragOperationNone;
+        // Save as ignored in the answer rect.
+        qDMEvent.setDropAction(Qt::IgnoreAction);
     }
+    qt_mac_copy_answer_rect(qDMEvent);
     return operation;
 }
 
diff --git a/src/gui/widgets/qabstractspinbox.cpp b/src/gui/widgets/qabstractspinbox.cpp
index a59cd48..e26d5c3 100644
--- a/src/gui/widgets/qabstractspinbox.cpp
+++ b/src/gui/widgets/qabstractspinbox.cpp
@@ -1180,7 +1180,7 @@ static int getKeyboardAutoRepeatRate() {
     TTimeIntervalMicroSeconds32 time;
     S60->wsSession().GetKeyboardRepeatRate(initialTime, time);
     ret = time.Int() / 1000; // msecs
-#elif defined(Q_OS_WIN) and !defined(Q_OS_WINCE)
+#elif defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
     DWORD time;
     if (SystemParametersInfo(SPI_GETKEYBOARDSPEED, 0, &time, 0) != FALSE)
         ret = static_cast<int>(1000 / static_cast<int>(time)); // msecs
diff --git a/src/xmlpatterns/api/api.pri b/src/xmlpatterns/api/api.pri
index 9fcc2f5..a0adf75 100644
--- a/src/xmlpatterns/api/api.pri
+++ b/src/xmlpatterns/api/api.pri
@@ -1,59 +1,57 @@
-HEADERS += $$PWD/qabstractxmlforwarditerator_p.h                            \
-           $$PWD/qabstractmessagehandler.h                                  \
-           $$PWD/qabstracturiresolver.h                                     \
-           $$PWD/qabstractxmlnodemodel.h                                    \
-           $$PWD/qabstractxmlnodemodel_p.h                                  \
-           $$PWD/qabstractxmlpullprovider_p.h                               \
-           $$PWD/qabstractxmlreceiver.h                                     \
-           $$PWD/qabstractxmlreceiver_p.h                                   \
-           $$PWD/qdeviceresourceloader_p.h                                  \
-           $$PWD/qiodevicedelegate_p.h                                      \
-           $$PWD/qnetworkaccessdelegator_p.h                                \
-           $$PWD/qpullbridge_p.h                                            \
-           $$PWD/qresourcedelegator_p.h                                     \
-           $$PWD/qsimplexmlnodemodel.h                                      \
-           $$PWD/qsourcelocation.h                                          \
-           $$PWD/quriloader_p.h                                             \
-           $$PWD/qvariableloader_p.h                                        \
-           $$PWD/qxmlformatter.h                                            \
-           $$PWD/qxmlname.h                                                 \
-           $$PWD/qxmlnamepool.h                                             \
-           $$PWD/qxmlquery.h                                                \
-           $$PWD/qxmlquery_p.h                                              \
-           $$PWD/qxmlresultitems.h                                          \
-           $$PWD/qxmlresultitems_p.h                                        \
-           $$PWD/qxmlschema.h                                               \
-           $$PWD/qxmlschema_p.h                                             \
-           $$PWD/qxmlschemavalidator.h                                      \
-           $$PWD/qxmlschemavalidator_p.h                                    \
-           $$PWD/qxmlserializer.h                                           \
-           $$PWD/qxmlserializer_p.h                                         \
-           $$PWD/../../../tools/xmlpatterns/qcoloringmessagehandler_p.h     \
-           $$PWD/../../../tools/xmlpatterns/qcoloroutput_p.h
-
-SOURCES += $$PWD/qvariableloader.cpp                                        \
-           $$PWD/qabstractmessagehandler.cpp                                \
-           $$PWD/qabstracturiresolver.cpp                                   \
-           $$PWD/qabstractxmlnodemodel.cpp                                  \
-           $$PWD/qabstractxmlpullprovider.cpp                               \
-           $$PWD/qabstractxmlreceiver.cpp                                   \
-           $$PWD/qiodevicedelegate.cpp                                      \
-           $$PWD/qnetworkaccessdelegator.cpp                                \
-           $$PWD/qpullbridge.cpp                                            \
-           $$PWD/qresourcedelegator.cpp                                     \
-           $$PWD/qsimplexmlnodemodel.cpp                                    \
-           $$PWD/qsourcelocation.cpp                                        \
-           $$PWD/quriloader.cpp                                             \
-           $$PWD/qxmlformatter.cpp                                          \
-           $$PWD/qxmlname.cpp                                               \
-           $$PWD/qxmlnamepool.cpp                                           \
-           $$PWD/qxmlquery.cpp                                              \
-           $$PWD/qxmlresultitems.cpp                                        \
-           $$PWD/qxmlschema.cpp                                             \
-           $$PWD/qxmlschema_p.cpp                                           \
-           $$PWD/qxmlschemavalidator.cpp                                    \
-           $$PWD/qxmlserializer.cpp                                         \
-           $$PWD/../../../tools/xmlpatterns/qcoloringmessagehandler.cpp     \
-           $$PWD/../../../tools/xmlpatterns/qcoloroutput.cpp
-
-INCLUDEPATH += $$PWD/../../../tools/xmlpatterns/
+HEADERS += $$PWD/qabstractxmlforwarditerator_p.h \
+    $$PWD/qabstractmessagehandler.h \
+    $$PWD/qabstracturiresolver.h \
+    $$PWD/qabstractxmlnodemodel.h \
+    $$PWD/qabstractxmlnodemodel_p.h \
+    $$PWD/qabstractxmlpullprovider_p.h \
+    $$PWD/qabstractxmlreceiver.h \
+    $$PWD/qabstractxmlreceiver_p.h \
+    $$PWD/qdeviceresourceloader_p.h \
+    $$PWD/qiodevicedelegate_p.h \
+    $$PWD/qnetworkaccessdelegator_p.h \
+    $$PWD/qpullbridge_p.h \
+    $$PWD/qresourcedelegator_p.h \
+    $$PWD/qsimplexmlnodemodel.h \
+    $$PWD/qsourcelocation.h \
+    $$PWD/quriloader_p.h \
+    $$PWD/qvariableloader_p.h \
+    $$PWD/qxmlformatter.h \
+    $$PWD/qxmlname.h \
+    $$PWD/qxmlnamepool.h \
+    $$PWD/qxmlquery.h \
+    $$PWD/qxmlquery_p.h \
+    $$PWD/qxmlresultitems.h \
+    $$PWD/qxmlresultitems_p.h \
+    $$PWD/qxmlschema.h \
+    $$PWD/qxmlschema_p.h \
+    $$PWD/qxmlschemavalidator.h \
+    $$PWD/qxmlschemavalidator_p.h \
+    $$PWD/qxmlserializer.h \
+    $$PWD/qxmlserializer_p.h \
+    $$PWD/qcoloringmessagehandler_p.h \
+    $$PWD/qcoloroutput_p.h \
+    $$PWD/qxmlpatternistcli_p.h
+SOURCES += $$PWD/qvariableloader.cpp \
+    $$PWD/qabstractmessagehandler.cpp \
+    $$PWD/qabstracturiresolver.cpp \
+    $$PWD/qabstractxmlnodemodel.cpp \
+    $$PWD/qabstractxmlpullprovider.cpp \
+    $$PWD/qabstractxmlreceiver.cpp \
+    $$PWD/qiodevicedelegate.cpp \
+    $$PWD/qnetworkaccessdelegator.cpp \
+    $$PWD/qpullbridge.cpp \
+    $$PWD/qresourcedelegator.cpp \
+    $$PWD/qsimplexmlnodemodel.cpp \
+    $$PWD/qsourcelocation.cpp \
+    $$PWD/quriloader.cpp \
+    $$PWD/qxmlformatter.cpp \
+    $$PWD/qxmlname.cpp \
+    $$PWD/qxmlnamepool.cpp \
+    $$PWD/qxmlquery.cpp \
+    $$PWD/qxmlresultitems.cpp \
+    $$PWD/qxmlschema.cpp \
+    $$PWD/qxmlschema_p.cpp \
+    $$PWD/qxmlschemavalidator.cpp \
+    $$PWD/qxmlserializer.cpp \
+    $$PWD/qcoloringmessagehandler.cpp \
+    $$PWD/qcoloroutput.cpp
diff --git a/tools/xmlpatterns/qcoloringmessagehandler.cpp b/src/xmlpatterns/api/qcoloringmessagehandler.cpp
index a639ddd..7d3eb6f 100644
--- a/tools/xmlpatterns/qcoloringmessagehandler.cpp
+++ b/src/xmlpatterns/api/qcoloringmessagehandler.cpp
@@ -41,9 +41,8 @@
 
 #include <QXmlStreamReader>
 
-#include "main.h"
-
 #include "qcoloringmessagehandler_p.h"
+#include "qxmlpatternistcli_p.h"
 
 QT_BEGIN_NAMESPACE
 
diff --git a/tools/xmlpatterns/qcoloringmessagehandler_p.h b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
index 3e8d18b..3e8d18b 100644
--- a/tools/xmlpatterns/qcoloringmessagehandler_p.h
+++ b/src/xmlpatterns/api/qcoloringmessagehandler_p.h
diff --git a/tools/xmlpatterns/qcoloroutput.cpp b/src/xmlpatterns/api/qcoloroutput.cpp
index 4f27fd5..4f27fd5 100644
--- a/tools/xmlpatterns/qcoloroutput.cpp
+++ b/src/xmlpatterns/api/qcoloroutput.cpp
diff --git a/tools/xmlpatterns/qcoloroutput_p.h b/src/xmlpatterns/api/qcoloroutput_p.h
index 1917ec7..1917ec7 100644
--- a/tools/xmlpatterns/qcoloroutput_p.h
+++ b/src/xmlpatterns/api/qcoloroutput_p.h
diff --git a/src/xmlpatterns/api/qxmlpatternistcli_p.h b/src/xmlpatterns/api/qxmlpatternistcli_p.h
new file mode 100644
index 0000000..072e4aa
--- /dev/null
+++ b/src/xmlpatterns/api/qxmlpatternistcli_p.h
@@ -0,0 +1,74 @@
+/****************************************************************************
+**
+** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the XMLPatterns module of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL$
+** No Commercial Usage
+** This file contains pre-release code and may not be distributed.
+** You may use this file in accordance with the terms and conditions
+** contained in the Technology Preview License Agreement accompanying
+** this package.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
+**
+**
+**
+**
+**
+**
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+
+#ifndef Patternist_Cli_h
+#define Patternist_Cli_h
+
+#include <QCoreApplication>
+
+QT_BEGIN_HEADER
+
+QT_BEGIN_NAMESPACE
+
+class QXmlPatternistCLI
+{
+public:
+    Q_DECLARE_TR_FUNCTIONS(QXmlPatternistCLI)
+private:
+    inline QXmlPatternistCLI();
+    Q_DISABLE_COPY(QXmlPatternistCLI)
+};
+
+QT_END_NAMESPACE
+
+QT_END_HEADER
+
+#endif
diff --git a/src/xmlpatterns/xmlpatterns.pro b/src/xmlpatterns/xmlpatterns.pro
index 1df497d..a224762 100644
--- a/src/xmlpatterns/xmlpatterns.pro
+++ b/src/xmlpatterns/xmlpatterns.pro
@@ -1,15 +1,14 @@
-TARGET     = QtXmlPatterns
-QPRO_PWD   = $$PWD
-QT         = core network
-DEFINES   += QT_BUILD_XMLPATTERNS_LIB QT_NO_USING_NAMESPACE
+TARGET = QtXmlPatterns
+QPRO_PWD = $$PWD
+QT = core \
+    network
+DEFINES += QT_BUILD_XMLPATTERNS_LIB \
+    QT_NO_USING_NAMESPACE
 win32-msvc*|win32-icc:QMAKE_LFLAGS += /BASE:0x61000000
-
-unix:QMAKE_PKGCONFIG_REQUIRES = QtCore QtNetwork
-
+unix:QMAKE_PKGCONFIG_REQUIRES = QtCore \
+    QtNetwork
 include(../qbase.pri)
-
 PRECOMPILED_HEADER = ../corelib/global/qt_pch.h
-
 include($$PWD/common.pri)
 include($$PWD/acceltree/acceltree.pri)
 include($$PWD/api/api.pri)
@@ -25,14 +24,13 @@ include($$PWD/schema/schema.pri)
 include($$PWD/type/type.pri)
 include($$PWD/utils/utils.pri)
 include($$PWD/qobjectmodel/qobjectmodel.pri, "", true)
+wince*:# The Microsoft MIPS compiler crashes if /Og is specified
+:
 
-wince*: {
-   # The Microsoft MIPS compiler crashes if /Og is specified
-   # -O2/1 expands to /Og plus additional arguments.
-   contains(DEFINES, MIPS): {
-      QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/
-      QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/
-   }
+# -O2/1 expands to /Og plus additional arguments.
+contains(DEFINES, MIPS): { 
+    QMAKE_CXXFLAGS_RELEASE ~= s/-O2/-Oi -Ot -Oy -Ob2/
+    QMAKE_CXXFLAGS_RELEASE ~= s/-O1/-Os -Oy -Ob2/
 }
-
-symbian:TARGET.UID3=0x2001E62B
+symbian:TARGET.UID3 = 0x2001E62B
+HEADERS += 
diff --git a/tools/xmlpatterns/main.cpp b/tools/xmlpatterns/main.cpp
index 604523b..76853b5 100644
--- a/tools/xmlpatterns/main.cpp
+++ b/tools/xmlpatterns/main.cpp
@@ -49,6 +49,7 @@
 #include <QtCore/QUrl>
 #include <QtCore/QVariant>
 #include <QtCore/QVector>
+#include <QtCore/QCoreApplication>
 
 #include <QtXmlPatterns/QXmlFormatter>
 #include <QtXmlPatterns/QXmlItem>
@@ -58,7 +59,6 @@
 #include "private/qautoptr_p.h"
 #include "qapplicationargument_p.h"
 #include "qapplicationargumentparser_p.h"
-#include "qcoloringmessagehandler_p.h"
 
 #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE)
 /* Needed for opening stdout with _fdopen & friends. io.h seems to not be
diff --git a/tools/xmlpatterns/main.h b/tools/xmlpatterns/main.h
index cdef999..76b7097 100644
--- a/tools/xmlpatterns/main.h
+++ b/tools/xmlpatterns/main.h
@@ -54,21 +54,13 @@
 
 #include <QCoreApplication>
 
-QT_BEGIN_HEADER
-
-QT_BEGIN_NAMESPACE
-
 class QXmlPatternistCLI
 {
 public:
-        Q_DECLARE_TR_FUNCTIONS(QXmlPatternistCLI)
+    Q_DECLARE_TR_FUNCTIONS(QXmlPatternistCLI)
 private:
     inline QXmlPatternistCLI();
     Q_DISABLE_COPY(QXmlPatternistCLI)
 };
 
-QT_END_NAMESPACE
-
-QT_END_HEADER 
-
 #endif
diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro
index 47f5a48..8cd321c 100644
--- a/tools/xmlpatterns/xmlpatterns.pro
+++ b/tools/xmlpatterns/xmlpatterns.pro
@@ -17,16 +17,12 @@ CONFIG -= app_bundle
 # in libQtXmlPatterns. See src/xmlpatterns/api/api.pri.
 SOURCES = main.cpp                          \
           qapplicationargument.cpp          \
-          qapplicationargumentparser.cpp    \
-          qcoloringmessagehandler.cpp       \
-          qcoloroutput.cpp
+          qapplicationargumentparser.cpp    
 
 
 HEADERS = main.h                            \
           qapplicationargument.cpp          \
-          qapplicationargumentparser.cpp    \
-          qcoloringmessagehandler_p.h       \
-          qcoloroutput_p.h
+          qapplicationargumentparser.cpp    
 
 symbian: TARGET.UID3 = 0xA000D7C9