1 files changed, 41 insertions, 18 deletions

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
@@ -158,2 +158,4 @@ private:
     }
+    QTextStringChar( const QTextStringChar & ) {
+    }
     friend class QComplexText;
@@ -176,4 +178,4 @@ public:
 
-    static QString toString( const QMemArray<QTextStringChar> &data );
-    QString toString() const;
+    static QString toString( const QMemArray<QTextStringChar> &data, bool fixspaces = TRUE );
+    QString toString( bool fixspaces = TRUE ) const;
 
@@ -288,4 +290,4 @@ public:
     void gotoPageDown( int visibleHeight );
-    void gotoNextWord();
-    void gotoPreviousWord();
+    void gotoNextWord( bool onlySpace = FALSE );
+    void gotoPreviousWord( bool onlySpace = FALSE );
     void gotoWordLeft();
@@ -328,3 +330,3 @@ private:
     void pop();
-    void processNesting( Operation op );
+    bool processNesting( Operation op );
     void invalidateNested();
@@ -705,2 +707,3 @@ struct Q_EXPORT QTextDocumentSelection
     bool swapped;
+    Q_DUMMY_COMPARISON_OPERATOR(QTextDocumentSelection)
 };
@@ -841,2 +844,5 @@ public:
     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,
@@ -1069,2 +1075,3 @@ struct Q_EXPORT QTextParagraphSelection
     int start, end;
+    Q_DUMMY_COMPARISON_OPERATOR(QTextParagraphSelection)
 };
@@ -1138,15 +1145,6 @@ public:
 
-class Q_EXPORT QTextParagraphPseudoDocument
-{
-public:
-    QTextParagraphPseudoDocument();
-    ~QTextParagraphPseudoDocument();
-    QRect docRect;
-    QTextFormatter *pFormatter;
-    QTextCommandHistory *commandHistory;
-    int minw;
-    int wused;
-};
+class QTextParagraphPseudoDocument;
+
+class QSyntaxHighlighter;
 
-//nase
 class Q_EXPORT QTextParagraph
@@ -1155,2 +1153,3 @@ class Q_EXPORT QTextParagraph
     friend class QTextCursor;
+    friend class QSyntaxHighlighter;
 
@@ -1178,3 +1177,9 @@ public:
 
+#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;
@@ -1598,3 +1603,2 @@ public:
     void updateDefaultFormat( const QFont &font, const QColor &c, QStyleSheet *sheet );
-    QDict<QTextFormat> dict() const { return cKey; }
 
@@ -1618,2 +1622,15 @@ private:
 
+class Q_EXPORT QTextParagraphPseudoDocument
+{
+public:
+    QTextParagraphPseudoDocument();
+    ~QTextParagraphPseudoDocument();
+    QRect docRect;
+    QTextFormatter *pFormatter;
+    QTextCommandHistory *commandHistory;
+    int minw;
+    int wused;
+    QTextFormatCollection collection;
+};
+
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
@@ -1830,2 +1847,8 @@ inline void QTextDocument::takeFlow()
 
+inline bool QTextDocument::useDoubleBuffer( QTextParagraph *parag, QPainter *p )
+{
+    return ( !parag->document()->parent() || parag->document()->nextDoubleBuffered ) &&
+	( !p || !p->device() || p->device()->devType() != QInternal::Printer );
+}
+
 // +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++