Merge commit 'qt/master-stable' into 4.6-stable

Bring Qt 4.6 into the Qt-S60 repo. Conflicts: configure.exe mkspecs/features/qttest_p4.prf qmake/generators/makefile.cpp src/corelib/io/qdir.cpp src/corelib/io/qprocess.h src/corelib/kernel/qcoreevent.h src/corelib/kernel/qobject.cpp src/corelib/kernel/qsharedmemory_unix.cpp src/corelib/thread/qthread_p.h src/corelib/tools/qvector.h src/gui/dialogs/qdialog.cpp src/gui/dialogs/qfiledialog.cpp src/gui/dialogs/qfiledialog_p.h src/gui/dialogs/qmessagebox.cpp src/gui/graphicsview/qgraphicsitem.cpp src/gui/graphicsview/qgraphicsview.cpp src/gui/image/qpixmapcache.cpp src/gui/kernel/qapplication.cpp src/gui/kernel/qapplication_p.h src/gui/kernel/qwidget.cpp src/gui/kernel/qwidget_p.h src/gui/painting/qdrawhelper.cpp src/gui/painting/qpaintengine_raster.cpp src/gui/text/qfontengine_qpf.cpp src/gui/widgets/qmenubar.cpp src/network/socket/qlocalserver.cpp src/testlib/qtestcase.cpp src/testlib/testlib.pro tests/auto/qimagereader/tst_qimagereader.cpp tests/auto/qitemdelegate/tst_qitemdelegate.cpp tests/auto/qnetworkreply/tst_qnetworkreply.cpp tests/auto/qpixmap/qpixmap.pro
author: Jason Barron <jbarron@trolltech.com> 2009-06-25 13:49:53 (GMT)
committer: Jason Barron <jbarron@trolltech.com> 2009-06-25 13:49:53 (GMT)
commit: db8f05e257019694f5e8076845626008f2adc3dd (patch)
tree: 05d3959403cf15ac5f702091439e028af01f343b /src/gui/text
parent: 8aafaa65a1d16f8b982279f5aceedf1e281ddb5a (diff)
parent: 796a5a2c7d8c91a46ac761dde18b7da2ec6c177b (diff)
download: Qt-db8f05e257019694f5e8076845626008f2adc3dd.zip
Qt-db8f05e257019694f5e8076845626008f2adc3dd.tar.gz
Qt-db8f05e257019694f5e8076845626008f2adc3dd.tar.bz2
30 files changed, 354 insertions, 320 deletions
diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp
index 0bd2d9a..e1b39a0 100644
--- a/src/gui/text/qcssparser.cpp
+++ b/src/gui/text/qcssparser.cpp
@@ -58,46 +58,6 @@ QT_BEGIN_NAMESPACE
 
 using namespace QCss;
 
-const char *Scanner::tokenName(QCss::TokenType t)
-{
-    switch (t) {
-        case NONE: return "NONE";
-        case S: return "S";
-        case CDO: return "CDO";
-        case CDC: return "CDC";
-        case INCLUDES: return "INCLUDES";
-        case DASHMATCH: return "DASHMATCH";
-        case LBRACE: return "LBRACE";
-        case PLUS: return "PLUS";
-        case GREATER: return "GREATER";
-        case COMMA: return "COMMA";
-        case STRING: return "STRING";
-        case INVALID: return "INVALID";
-        case IDENT: return "IDENT";
-        case HASH: return "HASH";
-        case ATKEYWORD_SYM: return "ATKEYWORD_SYM";
-        case EXCLAMATION_SYM: return "EXCLAMATION_SYM";
-        case LENGTH: return "LENGTH";
-        case PERCENTAGE: return "PERCENTAGE";
-        case NUMBER: return "NUMBER";
-        case FUNCTION: return "FUNCTION";
-        case COLON: return "COLON";
-        case SEMICOLON: return "SEMICOLON";
-        case RBRACE: return "RBRACE";
-        case SLASH: return "SLASH";
-        case MINUS: return "MINUS";
-        case DOT: return "DOT";
-        case STAR: return "STAR";
-        case LBRACKET: return "LBRACKET";
-        case RBRACKET: return "RBRACKET";
-        case EQUAL: return "EQUAL";
-        case LPAREN: return "LPAREN";
-        case RPAREN: return "RPAREN";
-        case OR: return "OR";
-    }
-    return "";
-}
-
 struct QCssKnownValue
 {
     const char *name;
@@ -280,7 +240,7 @@ static const QCssKnownValue values[NumKnownValues - 1] = {
 };
 
 //Map id to strings as they appears in the 'values' array above
-static const int indexOfId[NumKnownValues] = { 0, 40, 47, 41, 48, 53, 34, 26, 68, 69, 25, 42, 5, 62, 46,
+static const short indexOfId[NumKnownValues] = { 0, 40, 47, 41, 48, 53, 34, 26, 68, 69, 25, 42, 5, 62, 46,
     29, 57, 58, 27, 50, 60, 6, 10, 38, 55, 19, 13, 17, 18, 20, 21, 49, 24, 45, 65, 36, 3, 2, 39, 61, 16,
     11, 56, 14, 32, 63, 54, 64, 33, 67, 8, 28, 37, 12, 35, 59, 7, 9, 4, 66, 52, 22, 23, 30, 31, 1, 15, 0,
     51, 44, 43 };
@@ -1509,7 +1469,7 @@ QRect Declaration::rectValue() const
     QStringList func = v.variant.toStringList();
     if (func.count() != 2 || func.at(0).compare(QLatin1String("rect")) != 0)
         return QRect();
-    QStringList args = func[1].split(QLatin1String(" "), QString::SkipEmptyParts);
+    QStringList args = func[1].split(QLatin1Char(' '), QString::SkipEmptyParts);
     if (args.count() != 4)
         return QRect();
     QRect rect(args[0].toInt(), args[1].toInt(), args[2].toInt(), args[3].toInt());
@@ -2154,7 +2114,7 @@ void Parser::init(const QString &css, bool isFile)
     if (isFile) {
         QFile file(css);
         if (file.open(QFile::ReadOnly)) {
-            sourcePath = QFileInfo(styleSheet).absolutePath() + QLatin1String("/");
+            sourcePath = QFileInfo(styleSheet).absolutePath() + QLatin1Char('/');
             QTextStream stream(&file);
             styleSheet = stream.readAll();
         } else {
diff --git a/src/gui/text/qcssparser_p.h b/src/gui/text/qcssparser_p.h
index 97a0aef..81f306d 100644
--- a/src/gui/text/qcssparser_p.h
+++ b/src/gui/text/qcssparser_p.h
@@ -403,7 +403,7 @@ struct BorderData {
 // 4. QVector<Declaration> - { prop1: value1; prop2: value2; }
 // 5. Declaration - prop1: value1;
 
-struct Q_GUI_EXPORT Declaration
+struct Q_AUTOTEST_EXPORT Declaration
 {
     struct DeclarationData : public QSharedData
     {
@@ -495,7 +495,7 @@ const quint64 PseudoClass_Alternate        = Q_UINT64_C(0x0000100000000000);
 const quint64 PseudoClass_Any              = Q_UINT64_C(0x0000ffffffffffff);
 const int NumPseudos = 46;
 
-struct Q_GUI_EXPORT Pseudo
+struct Pseudo
 {
     Pseudo() : negated(false) { }
     quint64 type;
@@ -504,7 +504,7 @@ struct Q_GUI_EXPORT Pseudo
     bool negated;
 };
 
-struct Q_GUI_EXPORT AttributeSelector
+struct AttributeSelector
 {
     enum ValueMatchType {
         NoMatch,
@@ -519,7 +519,7 @@ struct Q_GUI_EXPORT AttributeSelector
     ValueMatchType valueMatchCriterium;
 };
 
-struct Q_GUI_EXPORT BasicSelector
+struct BasicSelector
 {
     inline BasicSelector() : relationToNext(NoRelation) {}
 
@@ -539,7 +539,7 @@ struct Q_GUI_EXPORT BasicSelector
     Relation relationToNext;
 };
 
-struct Q_GUI_EXPORT Selector
+struct Q_AUTOTEST_EXPORT Selector
 {
     QVector<BasicSelector> basicSelectors;
     int specificity() const;
@@ -552,7 +552,7 @@ struct MediaRule;
 struct PageRule;
 struct ImportRule;
 
-struct Q_GUI_EXPORT ValueExtractor
+struct Q_AUTOTEST_EXPORT ValueExtractor
 {
     ValueExtractor(const QVector<Declaration> &declarations, const QPalette & = QPalette());
 
@@ -586,7 +586,7 @@ private:
     QPalette pal;
 };
 
-struct Q_GUI_EXPORT StyleRule
+struct StyleRule
 {
     StyleRule() : order(0) { }
     QVector<Selector> selectors;
@@ -594,19 +594,19 @@ struct Q_GUI_EXPORT StyleRule
     int order;
 };
 
-struct Q_GUI_EXPORT MediaRule
+struct MediaRule
 {
     QStringList media;
     QVector<StyleRule> styleRules;
 };
 
-struct Q_GUI_EXPORT PageRule
+struct PageRule
 {
     QString selector;
     QVector<Declaration> declarations;
 };
 
-struct Q_GUI_EXPORT ImportRule
+struct ImportRule
 {
     QString href;
     QStringList media;
@@ -620,7 +620,7 @@ enum StyleSheetOrigin {
     StyleSheetOrigin_Inline
 };
 
-struct Q_GUI_EXPORT StyleSheet
+struct StyleSheet
 {
     StyleSheet() : origin(StyleSheetOrigin_Unspecified), depth(0) { }
     QVector<StyleRule> styleRules;  //only contains rules that are not indexed
@@ -731,7 +731,6 @@ class Q_AUTOTEST_EXPORT Scanner
 public:
     static QString preprocess(const QString &input, bool *hasEscapeSequences = 0);
     static void scan(const QString &preprocessedInput, QVector<Symbol> *symbols);
-    static const char *tokenName(TokenType t);
 };
 
 class Q_GUI_EXPORT Parser
diff --git a/src/gui/text/qfontdatabase.cpp b/src/gui/text/qfontdatabase.cpp
index 416017d..76f5c39 100644
--- a/src/gui/text/qfontdatabase.cpp
+++ b/src/gui/text/qfontdatabase.cpp
@@ -94,34 +94,34 @@ static int getFontWeight(const QString &weightString)
     // Test in decreasing order of commonness
     if (s == QLatin1String("medium") ||
         s == QLatin1String("normal")
-        || s.compare(qApp->translate("QFontDatabase", "Normal"), Qt::CaseInsensitive) == 0)
+        || s.compare(QApplication::translate("QFontDatabase", "Normal"), Qt::CaseInsensitive) == 0)
         return QFont::Normal;
     if (s == QLatin1String("bold")
-        || s.compare(qApp->translate("QFontDatabase", "Bold"), Qt::CaseInsensitive) == 0)
+        || s.compare(QApplication::translate("QFontDatabase", "Bold"), Qt::CaseInsensitive) == 0)
         return QFont::Bold;
     if (s == QLatin1String("demibold") || s == QLatin1String("demi bold")
-        || s.compare(qApp->translate("QFontDatabase", "Demi Bold"), Qt::CaseInsensitive) == 0)
+        || s.compare(QApplication::translate("QFontDatabase", "Demi Bold"), Qt::CaseInsensitive) == 0)
         return QFont::DemiBold;
     if (s == QLatin1String("black")
-        || s.compare(qApp->translate("QFontDatabase", "Black"), Qt::CaseInsensitive) == 0)
+        || s.compare(QApplication::translate("QFontDatabase", "Black"), Qt::CaseInsensitive) == 0)
         return QFont::Black;
     if (s == QLatin1String("light"))
         return QFont::Light;
 
     if (s.contains(QLatin1String("bold"))
-        || s.contains(qApp->translate("QFontDatabase", "Bold"), Qt::CaseInsensitive)) {
+        || s.contains(QApplication::translate("QFontDatabase", "Bold"), Qt::CaseInsensitive)) {
         if (s.contains(QLatin1String("demi"))
-            || s.compare(qApp->translate("QFontDatabase", "Demi"), Qt::CaseInsensitive) == 0)
+            || s.compare(QApplication::translate("QFontDatabase", "Demi"), Qt::CaseInsensitive) == 0)
             return (int) QFont::DemiBold;
         return (int) QFont::Bold;
     }
 
     if (s.contains(QLatin1String("light"))
-        || s.compare(qApp->translate("QFontDatabase", "Light"), Qt::CaseInsensitive) == 0)
+        || s.compare(QApplication::translate("QFontDatabase", "Light"), Qt::CaseInsensitive) == 0)
         return (int) QFont::Light;
 
     if (s.contains(QLatin1String("black"))
-        || s.compare(qApp->translate("QFontDatabase", "Black"), Qt::CaseInsensitive) == 0)
+        || s.compare(QApplication::translate("QFontDatabase", "Black"), Qt::CaseInsensitive) == 0)
         return (int) QFont::Black;
 
     return (int) QFont::Normal;
@@ -261,10 +261,10 @@ QtFontStyle::Key::Key(const QString &styleString)
     weight = getFontWeight(styleString);
 
     if (styleString.contains(QLatin1String("Italic"))
-        || styleString.contains(qApp->translate("QFontDatabase", "Italic")))
+        || styleString.contains(QApplication::translate("QFontDatabase", "Italic")))
         style = QFont::StyleItalic;
     else if (styleString.contains(QLatin1String("Oblique"))
-             || styleString.contains(qApp->translate("QFontDatabase", "Oblique")))
+             || styleString.contains(QApplication::translate("QFontDatabase", "Oblique")))
         style = QFont::StyleOblique;
 }
 
@@ -951,7 +951,7 @@ static void initFontDef(const QtFontDesc &desc, const QFontDef &request, QFontDe
     if (! desc.foundry->name.isEmpty() && desc.family->count > 1) {
         fontDef->family += QString::fromLatin1(" [");
         fontDef->family += desc.foundry->name;
-        fontDef->family += QString::fromLatin1("]");
+        fontDef->family += QLatin1Char(']');
     }
 
     if (desc.style->smoothScalable)
@@ -1408,21 +1408,21 @@ static QString styleStringHelper(int weight, QFont::Style style)
 {
     QString result;
     if (weight >= QFont::Black)
-        result = qApp->translate("QFontDatabase", "Black");
+        result = QApplication::translate("QFontDatabase", "Black");
     else if (weight >= QFont::Bold)
-        result = qApp->translate("QFontDatabase", "Bold");
+        result = QApplication::translate("QFontDatabase", "Bold");
     else if (weight >= QFont::DemiBold)
-        result = qApp->translate("QFontDatabase", "Demi Bold");
+        result = QApplication::translate("QFontDatabase", "Demi Bold");
     else if (weight < QFont::Normal)
-        result = qApp->translate("QFontDatabase", "Light");
+        result = QApplication::translate("QFontDatabase", "Light");
 
     if (style == QFont::StyleItalic)
-        result += QLatin1Char(' ') + qApp->translate("QFontDatabase", "Italic");
+        result += QLatin1Char(' ') + QApplication::translate("QFontDatabase", "Italic");
     else if (style == QFont::StyleOblique)
-        result += QLatin1Char(' ') + qApp->translate("QFontDatabase", "Oblique");
+        result += QLatin1Char(' ') + QApplication::translate("QFontDatabase", "Oblique");
 
     if (result.isEmpty())
-        result = qApp->translate("QFontDatabase", "Normal");
+        result = QApplication::translate("QFontDatabase", "Normal");
 
     return result.simplified();
 }
@@ -1654,7 +1654,7 @@ QStringList QFontDatabase::families(WritingSystem writingSystem) const
                 if (!foundry.isEmpty()) {
                     str += QLatin1String(" [");
                     str += foundry;
-                    str += QLatin1String("]");
+                    str += QLatin1Char(']');
                 }
                 flist.append(str);
             }
@@ -2226,7 +2226,7 @@ QString QFontDatabase::writingSystemName(WritingSystem writingSystem)
         Q_ASSERT_X(false, "QFontDatabase::writingSystemName", "invalid 'writingSystem' parameter");
         break;
     }
-    return qApp ? qApp->translate("QFontDatabase", name) : QString::fromLatin1(name);
+    return QApplication::translate("QFontDatabase", name);
 }
 
 
diff --git a/src/gui/text/qfontdatabase_qws.cpp b/src/gui/text/qfontdatabase_qws.cpp
index 978ff8e..7f97cf2 100644
--- a/src/gui/text/qfontdatabase_qws.cpp
+++ b/src/gui/text/qfontdatabase_qws.cpp
@@ -57,6 +57,7 @@
 #include "qabstractfontengine_qws.h"
 #include "qabstractfontengine_p.h"
 #include <qdatetime.h>
+#include "qplatformdefs.h"
 
 // for mmap
 #include <stdlib.h>
@@ -89,7 +90,7 @@ void QFontDatabasePrivate::addQPF2File(const QByteArray &file)
     struct stat st;
     if (stat(file.constData(), &st))
         return;
-    int f = ::open(file, O_RDONLY);
+    int f = ::open(file, O_RDONLY, 0);
     if (f < 0)
         return;
     const uchar *data = (const uchar *)mmap(0, st.st_size, PROT_READ, MAP_SHARED, f, 0);
@@ -572,7 +573,7 @@ QFontEngine *loadSingleEngine(int script, const QFontPrivate *fp,
             qDebug() << "Resource not valid" << size->fileName;
         }
 #else
-        int f = ::open(size->fileName, O_RDONLY);
+        int f = ::open(size->fileName, O_RDONLY, 0);
         if (f >= 0) {
             QFontEngineQPF *fe = new QFontEngineQPF(request, f);
             if (fe->isValid())
@@ -660,8 +661,8 @@ QFontEngine *loadSingleEngine(int script, const QFontPrivate *fp,
         QString fn = qwsFontPath();
         fn += QLatin1Char('/');
         fn += family->name.toLower()
-              + QLatin1String("_") + QString::number(pixelSize*10)
-              + QLatin1String("_") + QString::number(style->key.weight)
+              + QLatin1Char('_') + QString::number(pixelSize*10)
+              + QLatin1Char('_') + QString::number(style->key.weight)
               + (style->key.style == QFont::StyleItalic ?
                  QLatin1String("i.qpf") : QLatin1String(".qpf"));
         //###rotation ###
diff --git a/src/gui/text/qfontdatabase_win.cpp b/src/gui/text/qfontdatabase_win.cpp
index 780ae28..fe1c08c 100644
--- a/src/gui/text/qfontdatabase_win.cpp
+++ b/src/gui/text/qfontdatabase_win.cpp
@@ -364,7 +364,7 @@ void addFontToDatabase(QString familyName, const QString &scriptName,
                 signature->fsUsb[0], signature->fsUsb[1],
                 signature->fsUsb[2], signature->fsUsb[3]
             };
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
             if (signature->fsUsb[0] == 0) {
                 // If the unicode ranges bit mask is zero then
                 // EnumFontFamiliesEx failed to determine it properly.
@@ -715,7 +715,7 @@ QFontEngine *loadEngine(int script, const QFontPrivate *fp, const QFontDef &requ
             f = deffnt;
         else if (fam == QLatin1String("system"))
             f = SYSTEM_FONT;
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         else if (fam == QLatin1String("system_fixed"))
             f = SYSTEM_FIXED_FONT;
         else if (fam == QLatin1String("ansi_fixed"))
@@ -774,7 +774,7 @@ QFontEngine *loadEngine(int script, const QFontPrivate *fp, const QFontDef &requ
         int strat = OUT_DEFAULT_PRECIS;
         if (request.styleStrategy & QFont::PreferBitmap) {
             strat = OUT_RASTER_PRECIS;
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         } else if (request.styleStrategy & QFont::PreferDevice) {
             strat = OUT_DEVICE_PRECIS;
         } else if (request.styleStrategy & QFont::PreferOutline) {
@@ -794,7 +794,7 @@ QFontEngine *loadEngine(int script, const QFontPrivate *fp, const QFontDef &requ
 
         if (request.styleStrategy & QFont::PreferMatch)
             qual = DRAFT_QUALITY;
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         else if (request.styleStrategy & QFont::PreferQuality)
             qual = PROOF_QUALITY;
 #endif
@@ -872,7 +872,7 @@ QFontEngine *loadEngine(int script, const QFontPrivate *fp, const QFontDef &requ
                 qErrnoWarning("QFontEngine::loadEngine: CreateFontIndirect with stretch failed");
         }
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
         if (hfont == 0) {
             hfont = (HFONT)GetStockObject(ANSI_VAR_FONT);
             stockFont = true;
diff --git a/src/gui/text/qfontdatabase_x11.cpp b/src/gui/text/qfontdatabase_x11.cpp
index 70e1599..8f67cec 100644
--- a/src/gui/text/qfontdatabase_x11.cpp
+++ b/src/gui/text/qfontdatabase_x11.cpp
@@ -392,7 +392,7 @@ int qt_mib_for_xlfd_encoding(const char *encoding)
     int id = qt_xlfd_encoding_id(encoding);
     if (id != -1) return xlfd_encoding[id].mib;
     return 0;
-};
+}
 
 int qt_encoding_id_for_mib(int mib)
 {
@@ -509,9 +509,9 @@ bool qt_fillFontDef(const QByteArray &xlfd, QFontDef *fd, int dpi, QtFontDesc *d
     fd->styleStrategy |= QFont::NoAntialias;
     fd->family = QString::fromLatin1(tokens[Family]);
     QString foundry = QString::fromLatin1(tokens[Foundry]);
-    if (! foundry.isEmpty() && foundry != QString::fromLatin1("*") && (!desc || desc->family->count > 1))
+    if (! foundry.isEmpty() && foundry != QLatin1String("*") && (!desc || desc->family->count > 1))
         fd->family +=
-            QString::fromLatin1(" [") + foundry + QString::fromLatin1("]");
+            QLatin1String(" [") + foundry + QLatin1Char(']');
 
     if (qstrlen(tokens[AddStyle]) > 0)
         fd->addStyle = QString::fromLatin1(tokens[AddStyle]);
@@ -1802,30 +1802,30 @@ QFontEngine *QFontDatabase::loadXlfd(int screen, int script, const QFontDef &req
 
             QByteArray xlfd("-");
             xlfd += desc.foundry->name.isEmpty() ? QByteArray("*") : desc.foundry->name.toLatin1();
-            xlfd += "-";
+            xlfd += '-';
             xlfd += desc.family->name.isEmpty() ? QByteArray("*") : desc.family->name.toLatin1();
-            xlfd += "-";
+            xlfd += '-';
             xlfd += desc.style->weightName ? desc.style->weightName : "*";
-            xlfd += "-";
+            xlfd += '-';
             xlfd += (desc.style->key.style == QFont::StyleItalic
-                     ? "i"
-                     : (desc.style->key.style == QFont::StyleOblique ? "o" : "r"));
-            xlfd += "-";
+                     ? 'i'
+                     : (desc.style->key.style == QFont::StyleOblique ? 'o' : 'r'));
+            xlfd += '-';
             xlfd += desc.style->setwidthName ? desc.style->setwidthName : "*";
             // ### handle add-style
             xlfd += "-*-";
             xlfd += QByteArray::number(px);
-            xlfd += "-";
+            xlfd += '-';
             xlfd += QByteArray::number(desc.encoding->xpoint);
-            xlfd += "-";
+            xlfd += '-';
             xlfd += QByteArray::number(desc.encoding->xres);
-            xlfd += "-";
+            xlfd += '-';
             xlfd += QByteArray::number(desc.encoding->yres);
-            xlfd += "-";
+            xlfd += '-';
             xlfd += desc.encoding->pitch;
-            xlfd += "-";
+            xlfd += '-';
             xlfd += QByteArray::number(desc.encoding->avgwidth);
-            xlfd += "-";
+            xlfd += '-';
             xlfd += xlfd_for_id(desc.encoding->encoding);
 
             FM_DEBUG("    using XLFD: %s\n", xlfd.data());
diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp
index 2f96984..f09e726 100644
--- a/src/gui/text/qfontengine.cpp
+++ b/src/gui/text/qfontengine.cpp
@@ -70,12 +70,6 @@ static inline bool qtransform_equals_no_translate(const QTransform &a, const QTr
     }
 }
 
-
-
-QFontEngineGlyphCache::~QFontEngineGlyphCache()
-{
-}
-
 // Harfbuzz helper functions
 
 static HB_Bool hb_stringToGlyphs(HB_Font font, const HB_UChar16 *string, hb_uint32 length, HB_Glyph *glyphs, hb_uint32 *numGlyphs, HB_Bool rightToLeft)
@@ -917,7 +911,7 @@ void QFontEngine::loadKerningPairs(QFixed scalingFactor)
 end:
     qSort(kerning_pairs);
 //    for (int i = 0; i < kerning_pairs.count(); ++i)
-//        qDebug() << "i" << i << "left_right" << hex << kerning_pairs.at(i).left_right;
+//        qDebug() << 'i' << i << "left_right" << hex << kerning_pairs.at(i).left_right;
 }
 
 #else
@@ -1660,12 +1654,6 @@ bool QFontEngineMulti::canRender(const QChar *string, int len)
     return allExist;
 }
 
-QFontEngine *QFontEngineMulti::engine(int at) const
-{
-    Q_ASSERT(at < engines.size());
-    return engines.at(at);
-}
-
 QImage QFontEngineMulti::alphaMapForGlyph(glyph_t)
 {
     Q_ASSERT(false);
diff --git a/src/gui/text/qfontengine_ft.cpp b/src/gui/text/qfontengine_ft.cpp
index f1dac96..ef0cdca 100644
--- a/src/gui/text/qfontengine_ft.cpp
+++ b/src/gui/text/qfontengine_ft.cpp
@@ -54,8 +54,6 @@
 #include <private/qpdf_p.h>
 #include <private/qharfbuzz_p.h>
 
-#include <private/qpdf_p.h>
-
 #include "qfontengine_ft_p.h"
 #include <ft2build.h>
 #include FT_FREETYPE_H
diff --git a/src/gui/text/qfontengine_mac.mm b/src/gui/text/qfontengine_mac.mm
index d397e4a..2e62086 100644
--- a/src/gui/text/qfontengine_mac.mm
+++ b/src/gui/text/qfontengine_mac.mm
@@ -135,12 +135,12 @@ QCoreTextFontEngineMulti::QCoreTextFontEngineMulti(const ATSFontFamilyRef &, con
         symbolicTraits |= kCTFontItalicTrait;
         break;
     }
-    
+
     QCFString name;
     ATSFontGetName(atsFontRef, kATSOptionFlagsDefault, &name);
-    QCFType<CTFontDescriptorRef> descriptor = CTFontDescriptorCreateWithNameAndSize(name, fontDef.pixelSize);
-    QCFType<CTFontRef> baseFont = CTFontCreateWithFontDescriptor(descriptor, fontDef.pixelSize, 0); 
-    ctfont = CTFontCreateCopyWithSymbolicTraits(baseFont, fontDef.pixelSize, 0, symbolicTraits, symbolicTraits);
+    QCFType<CTFontDescriptorRef> descriptor = CTFontDescriptorCreateWithNameAndSize(name, fontDef.pointSize);
+    QCFType<CTFontRef> baseFont = CTFontCreateWithFontDescriptor(descriptor, fontDef.pointSize, 0);
+    ctfont = CTFontCreateCopyWithSymbolicTraits(baseFont, fontDef.pointSize, 0, symbolicTraits, symbolicTraits);
 
     // CTFontCreateCopyWithSymbolicTraits returns NULL if we ask for a trait that does
     // not exist for the given font. (for example italic)
@@ -162,7 +162,7 @@ QCoreTextFontEngineMulti::QCoreTextFontEngineMulti(const ATSFontFamilyRef &, con
     QCoreTextFontEngine *fe = new QCoreTextFontEngine(ctfont, fontDef, this);
     fe->ref.ref();
     engines.append(fe);
-    
+
 }
 
 QCoreTextFontEngineMulti::~QCoreTextFontEngineMulti()
@@ -176,7 +176,7 @@ uint QCoreTextFontEngineMulti::fontIndexForFont(CTFontRef id) const
         if (CFEqual(engineAt(i)->ctfont, id))
             return i;
     }
-    
+
     QCoreTextFontEngineMulti *that = const_cast<QCoreTextFontEngineMulti *>(this);
     QCoreTextFontEngine *fe = new QCoreTextFontEngine(id, fontDef, that);
     fe->ref.ref();
@@ -227,7 +227,7 @@ bool QCoreTextFontEngineMulti::stringToCMap(const QChar *str, int len, QGlyphLay
             CTFontRef runFont = static_cast<CTFontRef>(CFDictionaryGetValue(runAttribs, NSFontAttributeName));
             const uint fontIndex = (fontIndexForFont(runFont) << 24);
             //NSLog(@"Run Font Name = %@", CTFontCopyFamilyName(runFont));
-            QVarLengthArray<CGGlyph, 512> cgglyphs(0);           
+            QVarLengthArray<CGGlyph, 512> cgglyphs(0);
             const CGGlyph *tmpGlyphs = CTRunGetGlyphsPtr(run);
             if (!tmpGlyphs) {
                 cgglyphs.resize(glyphCount);
@@ -260,7 +260,7 @@ bool QCoreTextFontEngineMulti::stringToCMap(const QChar *str, int len, QGlyphLay
 
                 CFIndex k = 0;
                 CFIndex i = 0;
-                for (i = stringRange.location; 
+                for (i = stringRange.location;
                      (i < stringRange.location + stringRange.length) && (k < glyphCount); ++i) {
                     if (tmpIndices[k * rtlSign + rtlOffset] == i || i == stringRange.location) {
                         logClusters[i] = k + firstGlyphIndex;
@@ -425,28 +425,28 @@ void QCoreTextFontEngine::draw(CGContextRef ctx, qreal x, qreal y, const QTextIt
     getGlyphPositions(ti.glyphs, matrix, ti.flags, glyphs, positions);
     if (glyphs.size() == 0)
         return;
-    
+
     CGContextSetFontSize(ctx, fontDef.pixelSize);
-    
+
     CGAffineTransform oldTextMatrix = CGContextGetTextMatrix(ctx);
-    
+
     CGAffineTransform cgMatrix = CGAffineTransformMake(1, 0, 0, -1, 0, -paintDeviceHeight);
-    
+
     CGAffineTransformConcat(cgMatrix, oldTextMatrix);
-    
+
     if (synthesisFlags & QFontEngine::SynthesizedItalic)
         cgMatrix = CGAffineTransformConcat(cgMatrix, CGAffineTransformMake(1, 0, -tanf(14 * acosf(0) / 90), 1, 0, 0));
-    
+
 // ###    cgMatrix = CGAffineTransformConcat(cgMatrix, transform);
-    
+
     CGContextSetTextMatrix(ctx, cgMatrix);
-    
+
     CGContextSetTextDrawingMode(ctx, kCGTextFill);
-    
-    
+
+
     QVarLengthArray<CGSize> advances(glyphs.size());
     QVarLengthArray<CGGlyph> cgGlyphs(glyphs.size());
-    
+
     for (int i = 0; i < glyphs.size() - 1; ++i) {
         advances[i].width = (positions[i + 1].x - positions[i].x).toReal();
         advances[i].height = (positions[i + 1].y - positions[i].y).toReal();
@@ -455,21 +455,21 @@ void QCoreTextFontEngine::draw(CGContextRef ctx, qreal x, qreal y, const QTextIt
     advances[glyphs.size() - 1].width = 0;
     advances[glyphs.size() - 1].height = 0;
     cgGlyphs[glyphs.size() - 1] = glyphs[glyphs.size() - 1];
-    
+
     CGContextSetFont(ctx, cgFont);
     //NSLog(@"Font inDraw %@  ctfont %@", CGFontCopyFullName(cgFont), CTFontCopyFamilyName(ctfont));
-    
+
     CGContextSetTextPosition(ctx, positions[0].x.toReal(), positions[0].y.toReal());
-    
+
     CGContextShowGlyphsWithAdvances(ctx, cgGlyphs.data(), advances.data(), glyphs.size());
-    
+
     if (synthesisFlags & QFontEngine::SynthesizedBold) {
         CGContextSetTextPosition(ctx, positions[0].x.toReal() + 0.5 * lineThickness().toReal(),
                                  positions[0].y.toReal());
-        
+
         CGContextShowGlyphsWithAdvances(ctx, cgGlyphs.data(), advances.data(), glyphs.size());
     }
-    
+
     CGContextSetTextMatrix(ctx, oldTextMatrix);
 }
 
@@ -624,7 +624,7 @@ QFontEngine::FaceId QCoreTextFontEngine::faceId() const
 
 bool QCoreTextFontEngine::canRender(const QChar *string, int len)
 {
-    QCFType<CTFontRef> retFont = CTFontCreateForString(ctfont, 
+    QCFType<CTFontRef> retFont = CTFontCreateForString(ctfont,
                   QCFType<CFStringRef>(CFStringCreateWithCharactersNoCopy(0,
                                                               reinterpret_cast<const UniChar *>(string),
                                                                           len, kCFAllocatorNull)),
@@ -674,7 +674,7 @@ QFontEngineMacMulti::QFontEngineMacMulti(const ATSFontFamilyRef &atsFamily, cons
     } else {
         if (fontDef.weight >= QFont::Bold)
             fntStyle |= ::bold;
-        if (fontDef.style != QFont::StyleNormal) 
+        if (fontDef.style != QFont::StyleNormal)
             fntStyle |= ::italic;
 
         FMFontStyle intrinsicStyle;
@@ -957,7 +957,7 @@ bool QFontEngineMacMulti::stringToCMap(const QChar *str, int len, QGlyphLayout *
         tmpItem.length = charCount;
         tmpItem.glyphs = shaperItem.glyphs.mid(glyphIdx, glyphCount);
         tmpItem.log_clusters = shaperItem.log_clusters + charIdx;
-        if (!stringToCMapInternal(tmpItem.string + tmpItem.from, tmpItem.length, 
+        if (!stringToCMapInternal(tmpItem.string + tmpItem.from, tmpItem.length,
                                   &tmpItem.glyphs, &glyphCount, flags,
                                   &tmpItem)) {
             *nglyphs = glyphIdx + glyphCount;
@@ -1223,12 +1223,12 @@ QFontEngineMac::QFontEngineMac(ATSUStyle baseStyle, ATSUFontID fontID, const QFo
 	transform = multiEngine->transform;
     else
 	transform = CGAffineTransformIdentity;
-    
+
     ATSUTextMeasurement metric;
 
     ATSUGetAttribute(style, kATSUAscentTag, sizeof(metric), &metric, 0);
     m_ascent = FixRound(metric);
-   
+
     ATSUGetAttribute(style, kATSUDescentTag, sizeof(metric), &metric, 0);
     m_descent = FixRound(metric);
 
@@ -1424,11 +1424,16 @@ void QFontEngineMac::addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, in
     addGlyphsToPathHelper(style, glyphs, positions, numGlyphs, path);
 }
 
-QImage QFontEngineMac::alphaMapForGlyph(glyph_t glyph)
+
+/*!
+  Helper function for alphaMapForGlyph and alphaRGBMapForGlyph. The two are identical, except for
+  the subpixel antialiasing...
+*/
+QImage QFontEngineMac::imageForGlyph(glyph_t glyph, int margin, bool colorful)
 {
     const glyph_metrics_t br = boundingBox(glyph);
     QImage im(qRound(br.width)+2, qRound(br.height)+4, QImage::Format_RGB32);
-    im.fill(0);
+    im.fill(0xff000000);
 
     CGColorSpaceRef colorspace = QCoreGraphicsPaintEngine::macGenericColorSpace();
 #if (MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4)
@@ -1446,7 +1451,7 @@ QImage QFontEngineMac::alphaMapForGlyph(glyph_t glyph)
     CGContextSetFontSize(ctx, fontDef.pixelSize);
     CGContextSetShouldAntialias(ctx, fontDef.pointSize > qt_antialiasing_threshold && !(fontDef.styleStrategy & QFont::NoAntialias));
     // turn off sub-pixel hinting - no support for that in OpenGL
-    CGContextSetShouldSmoothFonts(ctx, false);
+    CGContextSetShouldSmoothFonts(ctx, colorful);
     CGAffineTransform oldTextMatrix = CGContextGetTextMatrix(ctx);
     CGAffineTransform cgMatrix = CGAffineTransformMake(1, 0, 0, 1, 0, 0);
     CGAffineTransformConcat(cgMatrix, oldTextMatrix);
@@ -1478,6 +1483,13 @@ QImage QFontEngineMac::alphaMapForGlyph(glyph_t glyph)
 
     CGContextRelease(ctx);
 
+    return im;
+}
+
+QImage QFontEngineMac::alphaMapForGlyph(glyph_t glyph)
+{
+    QImage im = imageForGlyph(glyph, 2, false);
+
     QImage indexed(im.width(), im.height(), QImage::Format_Indexed8);
     QVector<QRgb> colors(256);
     for (int i=0; i<256; ++i)
@@ -1497,6 +1509,32 @@ QImage QFontEngineMac::alphaMapForGlyph(glyph_t glyph)
     return indexed;
 }
 
+QImage QFontEngineMac::alphaRGBMapForGlyph(glyph_t glyph, int margin, const QTransform &t)
+{
+    QImage im = imageForGlyph(glyph, margin, true);
+
+    if (t.type() >= QTransform::TxScale) {
+        im = im.transformed(t);
+    }
+
+    extern uchar qt_pow_rgb_gamma[256];
+
+    // gamma correct the pixels back to linear color space...
+    for (int y=0; y<im.height(); ++y) {
+        uint *pixels = (uint *) im.scanLine(y);
+        for (int x=0; x<im.width(); ++x) {
+            uint p = pixels[x];
+            uint r = qt_pow_rgb_gamma[qRed(p)];
+            uint g = qt_pow_rgb_gamma[qGreen(p)];
+            uint b = qt_pow_rgb_gamma[qBlue(p)];
+            pixels[x] = (r << 16) | (g << 8) | b | 0xff000000;
+        }
+    }
+
+    return im;
+}
+
+
 bool QFontEngineMac::canRender(const QChar *string, int len)
 {
     Q_ASSERT(false);
@@ -1650,7 +1688,7 @@ QFontEngine::Properties QFontEngineMac::properties() const
     if (ATSFontGetTable(atsFont, MAKE_TAG('p', 'o', 's', 't'), 10, 2, &lw, 0) == noErr)
        lw = qFromBigEndian<quint16>(lw);
     props.lineWidth = lw;
-    
+
     // CTFontCopyPostScriptName
     QCFString psName;
     if (ATSFontGetPostScriptName(FMGetATSFontRefFromFont(fontID), kATSOptionFlagsDefault, &psName) == noErr)
@@ -1665,7 +1703,7 @@ void QFontEngineMac::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_m
     ATSUCreateAndCopyStyle(style, &unscaledStyle);
 
     int emSquare = properties().emSquare.toInt();
-    
+
     const int maxAttributeCount = 4;
     ATSUAttributeTag tags[maxAttributeCount + 1];
     ByteCount sizes[maxAttributeCount + 1];
@@ -1677,7 +1715,7 @@ void QFontEngineMac::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_m
     sizes[attributeCount] = sizeof(size);
     values[attributeCount] = &size;
     ++attributeCount;
-    
+
     Q_ASSERT(attributeCount < maxAttributeCount + 1);
     OSStatus err = ATSUSetAttributes(unscaledStyle, attributeCount, tags, sizes, values);
     Q_ASSERT(err == noErr);
diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h
index a5aa097..fc5ff20 100644
--- a/src/gui/text/qfontengine_p.h
+++ b/src/gui/text/qfontengine_p.h
@@ -93,7 +93,6 @@ struct QGlyphLayout;
 
 class Q_GUI_EXPORT QFontEngine : public QObject
 {
-    Q_OBJECT
 public:
     enum Type {
         Box,
@@ -360,7 +359,7 @@ private:
     int _size;
 };
 
-class Q_GUI_EXPORT QFontEngineMulti : public QFontEngine
+class QFontEngineMulti : public QFontEngine
 {
 public:
     explicit QFontEngineMulti(int engineCount);
@@ -396,7 +395,9 @@ public:
     inline virtual const char *name() const
     { return "Multi"; }
 
-    QFontEngine *engine(int at) const;
+    QFontEngine *engine(int at) const
+    {Q_ASSERT(at < engines.size()); return engines.at(at); }
+
 
 protected:
     friend class QPSPrintEnginePrivate;
@@ -532,8 +533,11 @@ public:
     virtual Properties properties() const;
     virtual void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics);
     virtual QImage alphaMapForGlyph(glyph_t);
+    virtual QImage alphaRGBMapForGlyph(glyph_t, int margin, const QTransform &t);
 
 private:
+    QImage imageForGlyph(glyph_t glyph, int margin, bool colorful);
+
     ATSUFontID fontID;
     QCFType<CGFontRef> cgFont;
     ATSUStyle style;
diff --git a/src/gui/text/qfontengine_qpf.cpp b/src/gui/text/qfontengine_qpf.cpp
index 435a102..97d3847 100644
--- a/src/gui/text/qfontengine_qpf.cpp
+++ b/src/gui/text/qfontengine_qpf.cpp
@@ -252,7 +252,7 @@ QList<QByteArray> QFontEngineQPF::cleanUpAfterClientCrash(const QList<int> &cras
     for (int i = 0; i < int(dir.count()); ++i) {
         const QByteArray fileName = QFile::encodeName(dir.absoluteFilePath(dir[i]));
 
-        int fd = ::open(fileName.constData(), O_RDONLY);
+        int fd = ::open(fileName.constData(), O_RDONLY, 0);
         if (fd >= 0) {
             void *header = ::mmap(0, sizeof(QFontEngineQPF::Header), PROT_READ, MAP_SHARED, fd, 0);
             if (header && header != MAP_FAILED) {
@@ -308,7 +308,7 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng
     readOnly = true;
 
 #if defined(DEBUG_FONTENGINE)
-    qDebug() << "QFontEngineQPF::QFontEngineQPF( fd =" << fd << ", renderingFontEngine =" << renderingFontEngine << ")";
+    qDebug() << "QFontEngineQPF::QFontEngineQPF( fd =" << fd << ", renderingFontEngine =" << renderingFontEngine << ')';
 #endif
 
 #ifndef QT_FONTS_ARE_RESOURCES
@@ -316,9 +316,9 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng
         if (!renderingFontEngine)
             return;
 
-        fileName = fontDef.family.toLower() + QLatin1String("_")
+        fileName = fontDef.family.toLower() + QLatin1Char('_')
                    + QString::number(fontDef.pixelSize)
-                   + QLatin1String("_") + QString::number(fontDef.weight)
+                   + QLatin1Char('_') + QString::number(fontDef.weight)
                    + (fontDef.style != QFont::StyleNormal ?
                       QLatin1String("_italic") : QLatin1String(""))
                    + QLatin1String(".qsf");
@@ -331,9 +331,9 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng
             qDebug() << "found existing qpf:" << fileName;
 #endif
             if (::access(encodedFileName, W_OK | R_OK) == 0)
-                fd = ::open(encodedFileName, O_RDWR);
+                fd = ::open(encodedFileName, O_RDWR, 0);
             else if (::access(encodedFileName, R_OK) == 0)
-                fd = ::open(encodedFileName, O_RDONLY);
+                fd = ::open(encodedFileName, O_RDONLY, 0);
         } else {
 #if defined(DEBUG_FONTENGINE)
             qDebug() << "creating qpf on the fly:" << fileName;
@@ -347,7 +347,7 @@ QFontEngineQPF::QFontEngineQPF(const QFontDef &def, int fileDescriptor, QFontEng
                 generator.generate();
                 buffer.close();
                 const QByteArray &data = buffer.data();
-                ::write(fd, data.constData(), data.size());
+                QT_WRITE(fd, data.constData(), data.size());
             }
         }
     }
@@ -556,7 +556,7 @@ bool QFontEngineQPF::stringToCMap(const QChar *str, int len, QGlyphLayout *glyph
 #if 0 && defined(DEBUG_FONTENGINE)
             QChar c(uc);
             if (!findGlyph(glyphs[glyph_pos].glyph) && !seenGlyphs.contains(c))
-                qDebug() << "glyph for character" << c << "/" << hex << uc << "is" << dec << glyphs[glyph_pos].glyph;
+                qDebug() << "glyph for character" << c << '/' << hex << uc << "is" << dec << glyphs[glyph_pos].glyph;
 
             seenGlyphs.insert(c);
 #endif
@@ -899,8 +899,8 @@ void QFontEngineQPF::loadGlyph(glyph_t glyph)
     g.y = qRound(metrics.y);
     g.advance = qRound(metrics.xoff);
 
-    ::write(fd, &g, sizeof(g));
-    ::write(fd, img.bits(), img.numBytes());
+    QT_WRITE(fd, &g, sizeof(g));
+    QT_WRITE(fd, img.bits(), img.numBytes());
 
     glyphPos = oldSize - glyphDataOffset;
 #if 0 && defined(DEBUG_FONTENGINE)
diff --git a/src/gui/text/qfontengine_qws.cpp b/src/gui/text/qfontengine_qws.cpp
index d776329..10aef4c 100644
--- a/src/gui/text/qfontengine_qws.cpp
+++ b/src/gui/text/qfontengine_qws.cpp
@@ -387,7 +387,7 @@ QFontEngineQPF1::QFontEngineQPF1(const QFontDef&, const QString &fn)
 {
     cache_cost = 1;
 
-    int f = ::open( QFile::encodeName(fn), O_RDONLY );
+    int f = ::open( QFile::encodeName(fn), O_RDONLY, 0);
     Q_ASSERT(f>=0);
     QT_STATBUF st;
     if ( QT_FSTAT( f, &st ) )
diff --git a/src/gui/text/qfontengine_win.cpp b/src/gui/text/qfontengine_win.cpp
index dc2e1ff..4d3633b 100644
--- a/src/gui/text/qfontengine_win.cpp
+++ b/src/gui/text/qfontengine_win.cpp
@@ -65,7 +65,7 @@
 #include <private/qpaintengine_raster_p.h>
 #include <private/qnativeimage_p.h>
 
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
 #include "qguifunctions_wince.h"
 #endif
 
@@ -205,7 +205,7 @@ QFixed QFontEngineWin::lineThickness() const
     return QFontEngine::lineThickness();
 }
 
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
 static OUTLINETEXTMETRICW *getOutlineTextMetric(HDC hdc)
 {
     int size;
@@ -249,7 +249,7 @@ void QFontEngineWin::getCMap()
     designToDevice = 1;
     _faceId.index = 0;
     if(cmap) {
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
         OUTLINETEXTMETRICW *otm = getOutlineTextMetric(hdc);
 #else
         OUTLINETEXTMETRICA *otm = getOutlineTextMetric(hdc);
@@ -286,7 +286,7 @@ int QFontEngineWin::getGlyphIndexes(const QChar *str, int numChars, QGlyphLayout
     int i = 0;
     int glyph_pos = 0;
     if (mirrored) {
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
         {
 #else
         if (symbol) {
@@ -314,7 +314,7 @@ int QFontEngineWin::getGlyphIndexes(const QChar *str, int numChars, QGlyphLayout
             for (; i < numChars; ++i, ++glyph_pos) {
                 uint ucs = QChar::mirroredChar(getChar(str, i, numChars));
                 if (
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
                     tm.w.tmFirstChar > 60000 || // see line 375
 #endif
                         ucs >= first && ucs <= last)
@@ -324,7 +324,7 @@ int QFontEngineWin::getGlyphIndexes(const QChar *str, int numChars, QGlyphLayout
             }
         }
     } else {
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
         {
 #else
         if (symbol) {
@@ -352,7 +352,7 @@ int QFontEngineWin::getGlyphIndexes(const QChar *str, int numChars, QGlyphLayout
             for (; i < numChars; ++i, ++glyph_pos) {
                 uint uc = getChar(str, i, numChars);
                 if (
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
                     tm.w.tmFirstChar > 60000 || // see comment in QFontEngineWin
 #endif
                         uc >= first && uc <= last)
@@ -482,7 +482,7 @@ bool QFontEngineWin::stringToCMap(const QChar *str, int len, QGlyphLayout *glyph
     if (flags & QTextEngine::GlyphIndicesOnly)
         return true;
 
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
     HDC hdc = shared_dc();
     if (flags & QTextEngine::DesignMetrics) {
         HGDIOBJ oldFont = 0;
@@ -585,7 +585,7 @@ void QFontEngineWin::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFla
 
                     designAdvances[glyph] = QFixed(width) / designToDevice;
                 } else {
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
                     GLYPHMETRICS gm;
                     DWORD res = GDI_ERROR;
                     MAT2 mat;
@@ -647,7 +647,7 @@ void QFontEngineWin::recalcAdvances(QGlyphLayout *glyphs, QTextEngine::ShaperFla
 
                     width -= overhang;
                 } else {
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
                     GLYPHMETRICS gm;
                     DWORD res = GDI_ERROR;
                     MAT2 mat;
@@ -693,14 +693,14 @@ glyph_metrics_t QFontEngineWin::boundingBox(const QGlyphLayout &glyphs)
 
 
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
 typedef HRESULT (WINAPI *pGetCharABCWidthsFloat)(HDC, UINT, UINT, LPABCFLOAT);
 static pGetCharABCWidthsFloat qt_GetCharABCWidthsFloat = 0;
 #endif
 
 glyph_metrics_t QFontEngineWin::boundingBox(glyph_t glyph, const QTransform &t)
 {
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     GLYPHMETRICS gm;
 
     HDC hdc = shared_dc();
@@ -871,7 +871,7 @@ qreal QFontEngineWin::minLeftBearing() const
 
 qreal QFontEngineWin::minRightBearing() const
 {
-#ifdef Q_OS_WINCE
+#ifdef Q_WS_WINCE
     if (rbearing == SHRT_MIN) {
         int ml = 0;
         int mr = 0;
@@ -1047,7 +1047,7 @@ static inline QPointF qt_to_qpointf(const POINTFX &pt, qreal scale) {
 static bool addGlyphToPath(glyph_t glyph, const QFixedPoint &position, HDC hdc,
                            QPainterPath *path, bool ttf, glyph_metrics_t *metric = 0, qreal scale = 1)
 {
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
     Q_UNUSED(glyph);
     Q_UNUSED(hdc);
 #endif
@@ -1064,7 +1064,7 @@ static bool addGlyphToPath(glyph_t glyph, const QFixedPoint &position, HDC hdc,
     GLYPHMETRICS gMetric;
     memset(&gMetric, 0, sizeof(GLYPHMETRICS));
     int bufferSize = GDI_ERROR;
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     QT_WA( {
         bufferSize = GetGlyphOutlineW(hdc, glyph, glyphFormat, &gMetric, 0, 0, &mat);
     }, {
@@ -1077,7 +1077,7 @@ static bool addGlyphToPath(glyph_t glyph, const QFixedPoint &position, HDC hdc,
 
     void *dataBuffer = new char[bufferSize];
     DWORD ret = GDI_ERROR;
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     QT_WA( {
         ret = GetGlyphOutlineW(hdc, glyph, glyphFormat, &gMetric, bufferSize,
                             dataBuffer, &mat);
@@ -1199,7 +1199,7 @@ void QFontEngineWin::addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, in
 void QFontEngineWin::addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs,
                                       QPainterPath *path, QTextItem::RenderFlags flags)
 {
-#if !defined(Q_OS_WINCE)
+#if !defined(Q_WS_WINCE)
     if(tm.w.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR)) {
         hasOutline = true;
         QFontEngine::addOutlineToPath(x, y, glyphs, path, flags);
@@ -1267,7 +1267,7 @@ QFontEngine::Properties QFontEngineWin::properties() const
     });
     HDC hdc = shared_dc();
     HGDIOBJ oldfont = SelectObject(hdc, hf);
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
     OUTLINETEXTMETRICW *otm = getOutlineTextMetric(hdc);
 #else
     OUTLINETEXTMETRICA *otm = getOutlineTextMetric(hdc);
@@ -1333,6 +1333,7 @@ bool QFontEngineWin::getSfntTableData(uint tag, uchar *buffer, uint *length) con
 #    define CLEARTYPE_QUALITY       5
 #endif
 
+extern bool qt_cleartype_enabled;
 
 QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin,
                                            const QTransform &t, QImage::Format mask_format)
@@ -1351,7 +1352,7 @@ QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin
 
     bool has_transformation = t.type() > QTransform::TxTranslate;
 
-#ifndef Q_OS_WINCE
+#ifndef Q_WS_WINCE
     unsigned int options = ttf ? ETO_GLYPH_INDEX : 0;
     XFORM xform;
 
@@ -1408,7 +1409,11 @@ QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin
 
     QNativeImage *ni = new QNativeImage(iw + 2 * margin + 4,
                                         ih + 2 * margin + 4,
-                                        mask_format, true);
+                                        QNativeImage::systemFormat(), !qt_cleartype_enabled);
+
+    /*If cleartype is enabled we use the standard system format even on Windows CE 
+      and not the special textbuffer format we have to use if cleartype is disabled*/
+
     ni->image.fill(0xffffffff);
 
     HDC hdc = ni->hdc;
@@ -1437,7 +1442,6 @@ QNativeImage *QFontEngineWin::drawGDIGlyph(HFONT font, glyph_t glyph, int margin
 }
 
 
-extern bool qt_cleartype_enabled;
 extern uint qt_pow_gamma[256];
 
 QImage QFontEngineWin::alphaMapForGlyph(glyph_t glyph, const QTransform &xform)
diff --git a/src/gui/text/qfontengine_x11.cpp b/src/gui/text/qfontengine_x11.cpp
index 0972b2b..bafc99d 100644
--- a/src/gui/text/qfontengine_x11.cpp
+++ b/src/gui/text/qfontengine_x11.cpp
@@ -227,7 +227,7 @@ static QFontEngine::FaceId fontFile(const QByteArray &_xname, QFreetypeFace **fr
     QByteArray best_mapping;
 
     for (QStringList::ConstIterator it = fontpath.constBegin(); it != fontpath.constEnd(); ++it) {
-        if ((*it).left(1) != QLatin1String("/"))
+        if (!(*it).startsWith(QLatin1Char('/')))
             continue; // not a path name, a font server
         QString fontmapname;
         int num = 0;
@@ -693,9 +693,8 @@ QFontEngine::FaceId QFontEngineXLFD::faceId() const
         if (freetype) {
             const_cast<QFontEngineXLFD *>(this)->fsType = freetype->fsType();
         } else {
-            QFontEngine::Properties properties = QFontEngine::properties();
             face_id.index = 0;
-            face_id.filename = "-" + properties.postscriptName;
+            face_id.filename = '-' + QFontEngine::properties().postscriptName;
         }
     }
 #endif
diff --git a/src/gui/text/qfontengineglyphcache_p.h b/src/gui/text/qfontengineglyphcache_p.h
index 8589cc6..ca67e3f 100644
--- a/src/gui/text/qfontengineglyphcache_p.h
+++ b/src/gui/text/qfontengineglyphcache_p.h
@@ -72,7 +72,7 @@
 
 QT_BEGIN_NAMESPACE
 
-class Q_GUI_EXPORT QFontEngineGlyphCache
+class QFontEngineGlyphCache
 {
 public:
     QFontEngineGlyphCache(const QTransform &matrix) : m_transform(matrix) { }
@@ -83,7 +83,7 @@ public:
         Raster_Mono
     };
 
-    virtual ~QFontEngineGlyphCache();
+    virtual ~QFontEngineGlyphCache() { }
 
     QTransform m_transform;
 };
diff --git a/src/gui/text/qfontsubset.cpp b/src/gui/text/qfontsubset.cpp
index 0d1a884..e4d813d 100644
--- a/src/gui/text/qfontsubset.cpp
+++ b/src/gui/text/qfontsubset.cpp
@@ -333,17 +333,17 @@ QByteArray QFontSubset::glyphName(unsigned int glyph, const QVector<int> reverse
             name[0] = 0;
     }
     if (name[0]) {
-        s << "/" << name;
+        s << '/' << name;
     } else
 #endif
 #if defined(Q_WS_X11)
     if (fontEngine->type() == QFontEngine::XLFD) {
         uint uc = static_cast<QFontEngineXLFD *>(fontEngine)->toUnicode(glyphIndex);
-        s << "/" << glyphName(uc, false /* ### */);
+        s << '/' << glyphName(uc, false /* ### */);
     } else
 #endif
     if (reverseMap[glyphIndex] && reverseMap[glyphIndex] < 0x10000) {
-        s << "/" << glyphName(reverseMap[glyphIndex], false);
+        s << '/' << glyphName(reverseMap[glyphIndex], false);
     } else {
         s << "/gl" << (int)glyphIndex;
     }
@@ -395,13 +395,13 @@ QByteArray QFontSubset::widthArray() const
             int endnonlinear = startLinear ? startLinear : g;
             // qDebug("    startLinear=%x endnonlinear=%x", startLinear,endnonlinear);
             if (endnonlinear > start) {
-                s << start << "[";
+                s << start << '[';
                 for (int i = start; i < endnonlinear; ++i)
                     s << (widths[i]*scale).toInt();
                 s << "]\n";
             }
             if (startLinear)
-                s << startLinear << g - 1 << (widths[startLinear]*scale).toInt() << "\n";
+                s << startLinear << g - 1 << (widths[startLinear]*scale).toInt() << '\n';
         }
         s << "]\n";
     }
@@ -488,14 +488,14 @@ QByteArray QFontSubset::createToUnicodeMap() const
         int endnonlinear = startLinear ? startLinear : g;
         // qDebug("    startLinear=%x endnonlinear=%x", startLinear,endnonlinear);
         if (endnonlinear > start) {
-            s << "<" << QPdf::toHex((ushort)start, buf) << "> <";
+            s << '<' << QPdf::toHex((ushort)start, buf) << "> <";
             s << QPdf::toHex((ushort)(endnonlinear - 1), buf) << "> ";
             if (endnonlinear == start + 1) {
-                s << "<" << QPdf::toHex((ushort)reverseMap[start], buf) << ">\n";
+                s << '<' << QPdf::toHex((ushort)reverseMap[start], buf) << ">\n";
             } else {
-                s << "[";
+                s << '[';
                 for (int i = start; i < endnonlinear; ++i) {
-                    s << "<" << QPdf::toHex((ushort)reverseMap[i], buf) << "> ";
+                    s << '<' << QPdf::toHex((ushort)reverseMap[i], buf) << "> ";
                 }
                 s << "]\n";
             }
@@ -508,9 +508,9 @@ QByteArray QFontSubset::createToUnicodeMap() const
                 int uc_end = uc_start + len - 1;
                 if ((uc_end >> 8) != (uc_start >> 8))
                     len = 256 - (uc_start & 0xff);
-                s << "<" << QPdf::toHex((ushort)startLinear, buf) << "> <";
+                s << '<' << QPdf::toHex((ushort)startLinear, buf) << "> <";
                 s << QPdf::toHex((ushort)(startLinear + len - 1), buf) << "> ";
-                s << "<" << QPdf::toHex((ushort)reverseMap[startLinear], buf) << ">\n";
+                s << '<' << QPdf::toHex((ushort)reverseMap[startLinear], buf) << ">\n";
                 checkRanges(ts, ranges, nranges);
                 startLinear += len;
             }
@@ -1655,7 +1655,7 @@ QByteArray QFontSubset::toType1() const
 
     QByteArray id = QByteArray::number(object_id);
     QByteArray psname = properties.postscriptName;
-    psname.replace(" ", "");
+    psname.replace(' ', "");
 
     standard_font = false;
 
@@ -1681,12 +1681,12 @@ QByteArray QFontSubset::toType1() const
 #endif
     s << "/F" << id << "-Base\n";
     if (standard_font) {
-            s << "/" << psname << " findfont\n"
+            s << '/' << psname << " findfont\n"
                 "0 dict copy dup /NumGlyphs 0 put dup /CMap 256 array put def\n";
     } else {
         s << "<<\n";
         if(!psname.isEmpty())
-            s << "/FontName /" << psname << "\n";
+            s << "/FontName /" << psname << '\n';
         s << "/FontInfo <</FsType " << (int)fontEngine->fsType << ">>\n"
             "/FontType 1\n"
             "/PaintType 0\n"
@@ -1722,7 +1722,7 @@ QByteArray QFontSubset::type1AddedGlyphs() const
     int nGlyphs = glyph_indices.size();
     QByteArray id = QByteArray::number(object_id);
 
-    s << "F" << id << "-Base [\n";
+    s << 'F' << id << "-Base [\n";
     for (int i = downloaded_glyphs; i < nGlyphs; ++i) {
         glyph_t g = glyph_indices.at(i);
         QPainterPath path;
diff --git a/src/gui/text/qtextcontrol.cpp b/src/gui/text/qtextcontrol.cpp
index 69e1ee4..a3b6085 100644
--- a/src/gui/text/qtextcontrol.cpp
+++ b/src/gui/text/qtextcontrol.cpp
@@ -82,7 +82,7 @@
 #include "private/qapplication_p.h"
 #include "private/qshortcutmap_p.h"
 #include <qkeysequence.h>
-#define ACCEL_KEY(k) (!qApp->d_func()->shortcutMap.hasShortcutForKeySequence(k) ? QLatin1String("\t") + QString(QKeySequence(k)) : QString())
+#define ACCEL_KEY(k) (!qApp->d_func()->shortcutMap.hasShortcutForKeySequence(k) ? QLatin1Char('\t') + QString(QKeySequence(k)) : QString())
 #else
 #define ACCEL_KEY(k) QString()
 #endif
@@ -394,7 +394,7 @@ void QTextControlPrivate::init(Qt::TextFormat format, const QString &text, QText
     Q_Q(QTextControl);
     setContent(format, text, document);
 
-    QWidget *parentWidget = qobject_cast<QWidget*>(q->parent());
+    QWidget *parentWidget = qobject_cast<QWidget*>(parent);
     if (parentWidget) {
         QTextOption opt = doc->defaultTextOption();
         opt.setTextDirection(parentWidget->layoutDirection());
@@ -1715,7 +1715,7 @@ void QTextControlPrivate::mouseDoubleClickEvent(QEvent *e, Qt::MouseButton butto
     selectedWordOnDoubleClick = cursor;
 
     trippleClickPoint = pos;
-    trippleClickTimer.start(qApp->doubleClickInterval(), q);
+    trippleClickTimer.start(QApplication::doubleClickInterval(), q);
     if (doEmit) {
         selectionChanged();
 #ifndef QT_NO_CLIPBOARD
diff --git a/src/gui/text/qtextcontrol_p.h b/src/gui/text/qtextcontrol_p.h
index e50540a..4dac4f7 100644
--- a/src/gui/text/qtextcontrol_p.h
+++ b/src/gui/text/qtextcontrol_p.h
@@ -83,7 +83,7 @@ class QAbstractScrollArea;
 class QEvent;
 class QTimerEvent;
 
-class Q_GUI_EXPORT QTextControl : public QObject
+class Q_AUTOTEST_EXPORT QTextControl : public QObject
 {
     Q_OBJECT
     Q_DECLARE_PRIVATE(QTextControl)
diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp
index 48963bb..b9e1c89 100644
--- a/src/gui/text/qtextcursor.cpp
+++ b/src/gui/text/qtextcursor.cpp
@@ -145,7 +145,6 @@ void QTextCursorPrivate::remove()
 {
     if (anchor == position)
         return;
-    priv->beginEditBlock();
     currentCharFormat = -1;
     int pos1 = position;
     int pos2 = adjusted_anchor;
@@ -159,15 +158,18 @@ void QTextCursorPrivate::remove()
     // deleting inside table? -> delete only content
     QTextTable *table = complexSelectionTable();
     if (table) {
+        priv->beginEditBlock();
         int startRow, startCol, numRows, numCols;
         selectedTableCells(&startRow, &numRows, &startCol, &numCols);
         clearCells(table, startRow, startCol, numRows, numCols, op);
+        adjusted_anchor = anchor = position;
+        priv->endEditBlock();
     } else {
         priv->remove(pos1, pos2-pos1, op);
+        adjusted_anchor = anchor = position;
+        priv->finishEdit();
     }
 
-    adjusted_anchor = anchor = position;
-    priv->endEditBlock();
 }
 
 void QTextCursorPrivate::clearCells(QTextTable *table, int startRow, int startCol, int numRows, int numCols, QTextUndoCommand::Operation op)
@@ -1291,9 +1293,14 @@ void QTextCursor::insertText(const QString &text, const QTextCharFormat &_format
     QTextCharFormat format = _format;
     format.clearProperty(QTextFormat::ObjectIndex);
 
-    d->priv->beginEditBlock();
+    bool hasEditBlock = false;
+
+    if (d->anchor != d->position) {
+        hasEditBlock = true;
+        d->priv->beginEditBlock();
+        d->remove();
+    }
 
-    d->remove();
     if (!text.isEmpty()) {
         QTextFormatCollection *formats = d->priv->formatCollection();
         int formatIdx = formats->indexForFormat(format);
@@ -1323,6 +1330,11 @@ void QTextCursor::insertText(const QString &text, const QTextCharFormat &_format
                 || ch == QChar::ParagraphSeparator
                 || ch == QLatin1Char('\r')) {
 
+                if (!hasEditBlock) {
+                    hasEditBlock = true;
+                    d->priv->beginEditBlock();
+                }
+
                 if (blockEnd > blockStart)
                     d->priv->insert(d->position, textStart + blockStart, blockEnd - blockStart, formatIdx);
 
@@ -1333,7 +1345,8 @@ void QTextCursor::insertText(const QString &text, const QTextCharFormat &_format
         if (textStart + blockStart < textEnd)
             d->priv->insert(d->position, textStart + blockStart, textEnd - textStart - blockStart, formatIdx);
     }
-    d->priv->endEditBlock();
+    if (hasEditBlock)
+        d->priv->endEditBlock();
     d->setX();
 }
 
@@ -1348,12 +1361,15 @@ void QTextCursor::deleteChar()
     if (!d || !d->priv)
         return;
 
-    if (d->position == d->anchor) {
-        if (!d->canDelete(d->position))
-            return;
-        d->adjusted_anchor = d->anchor =
-                             d->priv->nextCursorPosition(d->anchor, QTextLayout::SkipCharacters);
+    if (d->position != d->anchor) {
+        removeSelectedText();
+        return;
     }
+
+    if (!d->canDelete(d->position))
+        return;
+    d->adjusted_anchor = d->anchor =
+                         d->priv->nextCursorPosition(d->anchor, QTextLayout::SkipCharacters);
     d->remove();
     d->setX();
 }
@@ -1368,27 +1384,29 @@ void QTextCursor::deletePreviousChar()
 {
     if (!d || !d->priv)
         return;
-
-    if (d->position == d->anchor) {
-        if (d->anchor < 1 || !d->canDelete(d->anchor-1))
-            return;
-        d->anchor--;
-
-        QTextDocumentPrivate::FragmentIterator fragIt = d->priv->find(d->anchor);
-        const QTextFragmentData * const frag = fragIt.value();
-        int fpos = fragIt.position();
-        QChar uc = d->priv->buffer().at(d->anchor - fpos + frag->stringPosition);
-        if (d->anchor > fpos && uc.unicode() >= 0xdc00 && uc.unicode() < 0xe000) {
-            // second half of a surrogate, check if we have the first half as well,
-            // if yes delete both at once
-            uc = d->priv->buffer().at(d->anchor - 1 - fpos + frag->stringPosition);
-            if (uc.unicode() >= 0xd800 && uc.unicode() < 0xdc00)
-                --d->anchor;
-        }
-
-        d->adjusted_anchor = d->anchor;
+    
+    if (d->position != d->anchor) {
+        removeSelectedText();
+        return;
     }
-
+    
+    if (d->anchor < 1 || !d->canDelete(d->anchor-1))
+        return;
+    d->anchor--;
+    
+    QTextDocumentPrivate::FragmentIterator fragIt = d->priv->find(d->anchor);
+    const QTextFragmentData * const frag = fragIt.value();
+    int fpos = fragIt.position();
+    QChar uc = d->priv->buffer().at(d->anchor - fpos + frag->stringPosition);
+    if (d->anchor > fpos && uc.unicode() >= 0xdc00 && uc.unicode() < 0xe000) {
+        // second half of a surrogate, check if we have the first half as well,
+        // if yes delete both at once
+        uc = d->priv->buffer().at(d->anchor - 1 - fpos + frag->stringPosition);
+        if (uc.unicode() >= 0xd800 && uc.unicode() < 0xdc00)
+            --d->anchor;
+    }
+    
+    d->adjusted_anchor = d->anchor;
     d->remove();
     d->setX();
 }
@@ -1504,7 +1522,9 @@ void QTextCursor::removeSelectedText()
     if (!d || !d->priv || d->position == d->anchor)
         return;
 
+    d->priv->beginEditBlock();
     d->remove();
+    d->priv->endEditBlock();
     d->setX();
 }
 
diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp
index 873f846..23c3c20 100644
--- a/src/gui/text/qtextdocument.cpp
+++ b/src/gui/text/qtextdocument.cpp
@@ -2201,7 +2201,7 @@ void QTextHtmlExporter::emitTextLength(const char *attribute, const QTextLength
     if (length.type() == QTextLength::PercentageLength)
         html += QLatin1String("%\"");
     else
-        html += QLatin1String("\"");
+        html += QLatin1Char('\"');
 }
 
 void QTextHtmlExporter::emitAlignment(Qt::Alignment align)
diff --git a/src/gui/text/qtextdocument_p.cpp b/src/gui/text/qtextdocument_p.cpp
index 05ddf47..7700c14 100644
--- a/src/gui/text/qtextdocument_p.cpp
+++ b/src/gui/text/qtextdocument_p.cpp
@@ -193,6 +193,8 @@ QTextDocumentPrivate::QTextDocumentPrivate()
 
     undoEnabled = true;
     inContentsChange = false;
+    inEdit = false;
+
     defaultTextOption.setTabStop(80); // same as in qtextengine.cpp
     defaultTextOption.setWrapMode(QTextOption::WrapAtWordBoundaryOrAnywhere);
 
@@ -404,7 +406,7 @@ int QTextDocumentPrivate::insertBlock(const QChar &blockSeparator,
     int b = blocks.findNode(pos);
     QTextBlockData *B = blocks.fragment(b);
 
-    QTextUndoCommand c = { QTextUndoCommand::BlockInserted, true,
+    QTextUndoCommand c = { QTextUndoCommand::BlockInserted, editBlock != 0,
                            op, charFormat, strPos, pos, { blockFormat },
                            B->revision };
 
@@ -439,20 +441,20 @@ void QTextDocumentPrivate::insert(int pos, int strPos, int strLength, int format
     Q_ASSERT(pos >= 0 && pos < fragments.length());
     Q_ASSERT(formats.format(format).isCharFormat());
 
-    beginEditBlock();
+    beginEdit();
     insert_string(pos, strPos, strLength, format, QTextUndoCommand::MoveCursor);
     if (undoEnabled) {
         int b = blocks.findNode(pos);
         QTextBlockData *B = blocks.fragment(b);
 
-        QTextUndoCommand c = { QTextUndoCommand::Inserted, true,
+        QTextUndoCommand c = { QTextUndoCommand::Inserted, editBlock != 0,
                                QTextUndoCommand::MoveCursor, format, strPos, pos, { strLength },
                                B->revision };
         appendUndoItem(c);
         B->revision = undoState;
         Q_ASSERT(undoState == undoStack.size());
     }
-    endEditBlock();
+    finishEdit();
 }
 
 void QTextDocumentPrivate::insert(int pos, const QString &str, int format)
@@ -565,6 +567,7 @@ void QTextDocumentPrivate::move(int pos, int to, int length, QTextUndoCommand::O
     if (pos == to)
         return;
 
+    beginEdit();
     const bool needsInsert = to != -1;
 
 #if !defined(QT_NO_DEBUG)
@@ -584,8 +587,6 @@ void QTextDocumentPrivate::move(int pos, int to, int length, QTextUndoCommand::O
     Q_ASSERT(startAndEndInSameFrame || endIsEndOfChildFrame || startIsStartOfFrameAndEndIsEndOfFrameWithCommonParent || isFirstTableCell);
 #endif
 
-    beginEditBlock();
-
     split(pos);
     split(pos+length);
 
@@ -605,10 +606,10 @@ void QTextDocumentPrivate::move(int pos, int to, int length, QTextUndoCommand::O
         int blockRevision = B->revision;
 
         QTextFragmentData *X = fragments.fragment(x);
-        QTextUndoCommand c = { QTextUndoCommand::Removed, true,
+        QTextUndoCommand c = { QTextUndoCommand::Removed, editBlock != 0,
                                op, X->format, X->stringPosition, key, { X->size_array[0] },
                                blockRevision };
-        QTextUndoCommand cInsert = { QTextUndoCommand::Inserted, true,
+        QTextUndoCommand cInsert = { QTextUndoCommand::Inserted, editBlock != 0,
                                      op, X->format, X->stringPosition, dstKey, { X->size_array[0] },
                                      blockRevision };
 
@@ -648,7 +649,7 @@ void QTextDocumentPrivate::move(int pos, int to, int length, QTextUndoCommand::O
 
     Q_ASSERT(blocks.length() == fragments.length());
 
-    endEditBlock();
+    finishEdit();
 }
 
 void QTextDocumentPrivate::remove(int pos, int length, QTextUndoCommand::Operation op)
@@ -1004,8 +1005,12 @@ void QTextDocumentPrivate::appendUndoItem(const QTextUndoCommand &c)
 
     if (!undoStack.isEmpty() && modified) {
         QTextUndoCommand &last = undoStack[undoState - 1];
-        if (last.tryMerge(c))
-            return;
+        if ( (last.block && c.block) // part of the same block => can merge
+            || (!c.block && !last.block  // two single undo items => can merge
+                && (undoState < 2 || !undoStack[undoState-2].block))) {
+            if (last.tryMerge(c))
+                return;
+        }
     }
     if (modifiedState > undoState)
         modifiedState = -1;
@@ -1013,6 +1018,9 @@ void QTextDocumentPrivate::appendUndoItem(const QTextUndoCommand &c)
     undoState++;
     emitUndoAvailable(true);
     emitRedoAvailable(false);
+
+    if (!c.block)
+        emit document()->undoCommandAdded();
 }
 
 void QTextDocumentPrivate::truncateUndoStack()
@@ -1082,7 +1090,6 @@ void QTextDocumentPrivate::joinPreviousEditBlock()
 
 void QTextDocumentPrivate::endEditBlock()
 {
-    Q_Q(QTextDocument);
     if (--editBlock)
         return;
 
@@ -1093,6 +1100,18 @@ void QTextDocumentPrivate::endEditBlock()
             emit document()->undoCommandAdded();
     }
 
+    finishEdit();
+}
+
+void QTextDocumentPrivate::finishEdit()
+{
+    Q_Q(QTextDocument);
+
+    if (editBlock)
+        return;
+
+    inEdit = false;
+
     if (framesDirty)
         scan_frames(docChangeFrom, docChangeOldLength, docChangeLength);
 
@@ -1162,7 +1181,7 @@ void QTextDocumentPrivate::adjustDocumentChangesAndCursors(int from, int addedOr
     for (int i = 0; i < cursors.size(); ++i) {
         QTextCursorPrivate *curs = cursors.at(i);
         if (curs->adjustPosition(from, addedOrRemoved, op) == QTextCursorPrivate::CursorMoved) {
-            if (editBlock) {
+            if (editBlock || inEdit) {
                 if (!changedCursors.contains(curs))
                     changedCursors.append(curs);
             } else {
@@ -1279,7 +1298,7 @@ void QTextDocumentPrivate::changeObjectFormat(QTextObject *obj, int format)
     if (f)
         documentChange(f->firstPosition(), f->lastPosition() - f->firstPosition());
 
-    QTextUndoCommand c = { QTextUndoCommand::GroupFormatChange, true, QTextUndoCommand::MoveCursor, oldFormatIndex,
+    QTextUndoCommand c = { QTextUndoCommand::GroupFormatChange, editBlock != 0, QTextUndoCommand::MoveCursor, oldFormatIndex,
                            0, 0, { obj->d_func()->objectIndex }, 0 };
     appendUndoItem(c);
 
diff --git a/src/gui/text/qtextdocument_p.h b/src/gui/text/qtextdocument_p.h
index 25763e1..e10e7ae 100644
--- a/src/gui/text/qtextdocument_p.h
+++ b/src/gui/text/qtextdocument_p.h
@@ -139,7 +139,7 @@ public:
         MoveCursor = 1
     };
     quint16 command;
-    quint8 block; ///< All undo commands that have this set to zero/false are combined with the preceding command on undo/redo.
+    quint8 block; ///< All undo commands that have this set to true are combined with the preceding command on undo/redo.
     quint8 operation;
     int format;
     quint32 strPos;
@@ -202,6 +202,8 @@ public:
     inline void beginEditBlock() { editBlock++; }
     void joinPreviousEditBlock();
     void endEditBlock();
+    inline void beginEdit() { inEdit = true; }
+    void finishEdit();
     inline bool isInEditBlock() const { return editBlock; }
     void enableUndoRedo(bool enable);
     inline bool isUndoRedoEnabled() const { return undoEnabled; }
@@ -334,8 +336,9 @@ public:
     QCss::StyleSheet parsedDefaultStyleSheet;
 #endif
     int maximumBlockCount;
-    bool needsEnsureMaximumBlockCount;
-    bool inContentsChange;
+    uint needsEnsureMaximumBlockCount : 1;
+    uint inContentsChange : 1;
+    uint inEdit : 1; // between beginEdit() and finishEdit()
     QSizeF pageSize;
     QString title;
     QString url;
diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp
index c66d0c1..1cb806d 100644
--- a/src/gui/text/qtextdocumentlayout.cpp
+++ b/src/gui/text/qtextdocumentlayout.cpp
@@ -855,6 +855,24 @@ void QTextDocumentLayoutPrivate::drawBorder(QPainter *painter, const QRectF &rec
 
 void QTextDocumentLayoutPrivate::drawFrameDecoration(QPainter *painter, QTextFrame *frame, QTextFrameData *fd, const QRectF &clip, const QRectF &rect) const
 {
+
+    const QBrush bg = frame->frameFormat().background();
+    if (bg != Qt::NoBrush) {
+        QRectF bgRect = rect;
+        bgRect.adjust((fd->leftMargin + fd->border).toReal(),
+                      (fd->topMargin + fd->border).toReal(),
+                      - (fd->rightMargin + fd->border).toReal(),
+                      - (fd->bottomMargin + fd->border).toReal());
+
+        QRectF gradientRect; // invalid makes it default to bgRect
+        QPointF origin = bgRect.topLeft();
+        if (!frame->parentFrame()) {
+            bgRect = clip;
+            gradientRect.setWidth(painter->device()->width());
+            gradientRect.setHeight(painter->device()->height());
+        }
+        fillBackground(painter, bgRect, bg, origin, gradientRect);
+    }
     if (fd->border != 0) {
         painter->save();
         painter->setBrush(Qt::lightGray);
@@ -875,24 +893,6 @@ void QTextDocumentLayoutPrivate::drawFrameDecoration(QPainter *painter, QTextFra
 
         painter->restore();
     }
-
-    const QBrush bg = frame->frameFormat().background();
-    if (bg != Qt::NoBrush) {
-        QRectF bgRect = rect;
-        bgRect.adjust((fd->leftMargin + fd->border).toReal(),
-                      (fd->topMargin + fd->border).toReal(),
-                      - (fd->rightMargin + fd->border).toReal(),
-                      - (fd->bottomMargin + fd->border).toReal());
-
-        QRectF gradientRect; // invalid makes it default to bgRect
-        QPointF origin = bgRect.topLeft();
-        if (!frame->parentFrame()) {
-            bgRect = clip;
-            gradientRect.setWidth(painter->device()->width());
-            gradientRect.setHeight(painter->device()->height());
-        }
-        fillBackground(painter, bgRect, bg, origin, gradientRect);
-    }
 }
 
 static void adjustContextSelectionsForCell(QAbstractTextDocumentLayout::PaintContext &cell_context,
@@ -2500,7 +2500,7 @@ void QTextDocumentLayoutPrivate::layoutBlock(const QTextBlock &bl, int blockPosi
 
     LDEBUG << "layoutBlock from=" << layoutFrom << "to=" << layoutTo;
 
-//    qDebug() << "layoutBlock; width" << layoutStruct->x_right - layoutStruct->x_left << "(maxWidth is btw" << tl->maximumWidth() << ")";
+//    qDebug() << "layoutBlock; width" << layoutStruct->x_right - layoutStruct->x_left << "(maxWidth is btw" << tl->maximumWidth() << ')';
 
     if (previousBlockFormat) {
         qreal margin = qMax(blockFormat.topMargin(), previousBlockFormat->bottomMargin());
@@ -3205,18 +3205,16 @@ bool QTextDocumentLayout::contentHasAlignment() const
 
 qreal QTextDocumentLayoutPrivate::scaleToDevice(qreal value) const
 {
-    QPaintDevice *dev = q_func()->paintDevice();
-    if (!dev)
+    if (!paintDevice)
         return value;
-    return value * dev->logicalDpiY() / qreal(qt_defaultDpi());
+    return value * paintDevice->logicalDpiY() / qreal(qt_defaultDpi());
 }
 
 QFixed QTextDocumentLayoutPrivate::scaleToDevice(QFixed value) const
 {
-    QPaintDevice *dev = q_func()->paintDevice();
-    if (!dev)
+    if (!paintDevice)
         return value;
-    return value * QFixed(dev->logicalDpiY()) / QFixed(qt_defaultDpi());
+    return value * QFixed(paintDevice->logicalDpiY()) / QFixed(qt_defaultDpi());
 }
 
 QT_END_NAMESPACE
diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp
index 0c55ce5..3b102c3 100644
--- a/src/gui/text/qtextengine.cpp
+++ b/src/gui/text/qtextengine.cpp
@@ -363,7 +363,7 @@ static bool bidiItemize(QTextEngine *engine, QScriptAnalysis *analysis, QBidiCon
 #if (BIDI_DEBUG >= 2)
 //         qDebug() << "pos=" << current << " dir=" << directions[dir]
 //                  << " current=" << directions[dirCurrent] << " last=" << directions[status.last]
-//                  << " eor=" << eor << "/" << directions[status.eor]
+//                  << " eor=" << eor << '/' << directions[status.eor]
 //                  << " sor=" << sor << " lastStrong="
 //                  << directions[status.lastStrong]
 //                  << " level=" << (int)control.level << " override=" << (bool)control.override;
@@ -868,7 +868,7 @@ void QTextEngine::shapeText(int item) const
 
 #if defined(Q_WS_MAC)
     shapeTextMac(item);
-#elif defined(Q_OS_WINCE)
+#elif defined(Q_WS_WINCE)
     shapeTextWithCE(item);
 #else
     shapeTextWithHarfbuzz(item);
@@ -923,7 +923,7 @@ void QTextEngine::shapeText(int item) const
         si.width += glyphs.advances_x[i];
 }
 
-#if defined(Q_OS_WINCE) //TODO
+#if defined(Q_WS_WINCE) //TODO
 // set the glyph attributes heuristically. Assumes a 1 to 1 relationship between chars and glyphs
 // and no reordering.
 // also computes logClusters heuristically
diff --git a/src/gui/text/qtextengine_p.h b/src/gui/text/qtextengine_p.h
index cf241fa..6be525f 100644
--- a/src/gui/text/qtextengine_p.h
+++ b/src/gui/text/qtextengine_p.h
@@ -581,7 +581,7 @@ private:
     void addRequiredBoundaries() const;
     void shapeText(int item) const;
     void shapeTextWithHarfbuzz(int item) const;
-#if defined(Q_OS_WINCE)
+#if defined(Q_WS_WINCE)
     void shapeTextWithCE(int item) const;
 #endif
 #if defined(Q_WS_MAC)
diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp
index 38ac4ca..d93f084 100644
--- a/src/gui/text/qtextformat.cpp
+++ b/src/gui/text/qtextformat.cpp
@@ -142,6 +142,7 @@ QTextLength::operator QVariant() const
     return QVariant(QVariant::TextLength, this);
 }
 
+#ifndef QT_NO_DATASTREAM
 QDataStream &operator<<(QDataStream &stream, const QTextLength &length)
 {
     return stream << qint32(length.lengthType) << double(length.fixedValueOrPercentage);
@@ -156,6 +157,7 @@ QDataStream &operator>>(QDataStream &stream, QTextLength &length)
     length.lengthType = QTextLength::Type(type);
     return stream;
 }
+#endif // QT_NO_DATASTREAM
 
 class QTextFormatPrivate : public QSharedData
 {
@@ -374,6 +376,7 @@ void QTextFormatPrivate::recalcFont() const
     fontDirty = false;
 }
 
+#ifndef QT_NO_DATASTREAM
 Q_GUI_EXPORT QDataStream &operator<<(QDataStream &stream, const QTextFormat &fmt)
 {
     stream << fmt.format_type << fmt.properties();
@@ -396,6 +399,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt)
 
     return stream;
 }
+#endif // QT_NO_DATASTREAM
 
 /*!
     \class QTextFormat
diff --git a/src/gui/text/qtextformat.h b/src/gui/text/qtextformat.h
index 8eaeeb1..96c0739 100644
--- a/src/gui/text/qtextformat.h
+++ b/src/gui/text/qtextformat.h
@@ -76,8 +76,10 @@ class QTextCursor;
 class QTextDocument;
 class QTextLength;
 
+#ifndef QT_NO_DATASTREAM
 Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QTextLength &);
 Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QTextLength &);
+#endif
 
 class Q_GUI_EXPORT QTextLength
 {
@@ -119,8 +121,10 @@ private:
 inline QTextLength::QTextLength(Type atype, qreal avalue)
     : lengthType(atype), fixedValueOrPercentage(avalue) {}
 
+#ifndef QT_NO_DATASTREAM
 Q_GUI_EXPORT QDataStream &operator<<(QDataStream &, const QTextFormat &);
 Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QTextFormat &);
+#endif
 
 class Q_GUI_EXPORT QTextFormat
 {
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp
index b1f1b75..76c59c3 100644
--- a/src/gui/text/qtexthtmlparser.cpp
+++ b/src/gui/text/qtexthtmlparser.cpp
@@ -343,7 +343,7 @@ static QChar resolveEntity(const QString &entity)
     return e->code;
 }
 
-static const uint windowsLatin1ExtendedCharacters[0xA0 - 0x80] = {
+static const ushort windowsLatin1ExtendedCharacters[0xA0 - 0x80] = {
     0x20ac, // 0x80
     0x0081, // 0x81 direct mapping
     0x201a, // 0x82
@@ -499,7 +499,7 @@ void QTextHtmlParser::dumpHtml()
 {
     for (int i = 0; i < count(); ++i) {
         qDebug().nospace() << qPrintable(QString(depth(i)*4, QLatin1Char(' ')))
-                           << qPrintable(at(i).tag) << ":"
+                           << qPrintable(at(i).tag) << ':'
                            << quoteNewline(at(i).text);
             ;
     }
diff --git a/src/gui/text/qtextimagehandler_p.h b/src/gui/text/qtextimagehandler_p.h
index f5426b5..1f29642 100644
--- a/src/gui/text/qtextimagehandler_p.h
+++ b/src/gui/text/qtextimagehandler_p.h
@@ -60,7 +60,7 @@ QT_BEGIN_NAMESPACE
 
 class QTextImageFormat;
 
-class Q_GUI_EXPORT QTextImageHandler : public QObject,
+class QTextImageHandler : public QObject,
                           public QTextObjectInterface
 {
     Q_OBJECT
@@ -72,7 +72,7 @@ public:
     virtual void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format);
 
     typedef QImage (*ExternalImageLoaderFunction)(const QString &name, const QString &context);
-    static ExternalImageLoaderFunction externalLoader;
+    static Q_GUI_EXPORT ExternalImageLoaderFunction externalLoader; //this is needed by Qt3Support
 };
 
 QT_END_NAMESPACE
diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp
index 1edc3b8..bc8ac5b 100644
--- a/src/gui/text/qtextodfwriter.cpp
+++ b/src/gui/text/qtextodfwriter.cpp
@@ -295,28 +295,13 @@ void QTextOdfWriter::writeBlock(QXmlStreamWriter &writer, const QTextBlock &bloc
         writer.writeAttribute(textNS, QString::fromLatin1("style-name"), QString::fromLatin1("c%1")
             .arg(frag.fragment().charFormatIndex()));
         bool escapeNextSpace = true;
-        int precedingSpaces = 0, precedingTabs = 0;
+        int precedingSpaces = 0;
         int exportedIndex = 0;
         for (int i=0; i <= fragmentText.count(); ++i) {
-            bool isTab = false, isSpace = false;
-            if (i < fragmentText.count()) {
+            bool isSpace = false;
                 QChar character = fragmentText[i];
-                isTab = character.unicode() == '\t';
                 isSpace = character.unicode() == ' ';
-                if (character.unicode() == 0x2028) { // soft-return
-                    writer.writeCharacters(fragmentText.mid(exportedIndex, i));
-                    writer.writeEmptyElement(textNS, QString::fromLatin1("line-break"));
-                    exportedIndex = i+1;
-                    continue;
-                }
-                if (isSpace) {
-                    ++precedingSpaces;
-                    escapeNextSpace = true;
-                }
-                else if (isTab) {
-                    precedingTabs++;
-                }
-            }
+
             // find more than one space. -> <text:s text:c="2" />
             if (!isSpace && escapeNextSpace && precedingSpaces > 1) {
                 const bool startParag = exportedIndex == 0 && i == precedingSpaces;
@@ -329,17 +314,27 @@ void QTextOdfWriter::writeBlock(QXmlStreamWriter &writer, const QTextBlock &bloc
                 precedingSpaces = 0;
                 exportedIndex = i;
             }
-            // find tabs.   ->  <text:tab text:tab-ref="3" />  or <text:tab/>
-            if (!isTab && precedingTabs) {
-                writer.writeCharacters(fragmentText.mid(exportedIndex, i - precedingTabs - exportedIndex));
-                writer.writeEmptyElement(textNS, QString::fromLatin1("tab"));
-                if (precedingTabs > 1)
-                    writer.writeAttribute(textNS, QString::fromLatin1("tab-ref"), QString::number(precedingTabs));
-                precedingTabs = 0;
-                exportedIndex = i;
+
+            if (i < fragmentText.count()) {
+                if (character.unicode() == 0x2028) { // soft-return
+                    //if (exportedIndex < i)
+                        writer.writeCharacters(fragmentText.mid(exportedIndex, i - exportedIndex));
+                    writer.writeEmptyElement(textNS, QString::fromLatin1("line-break"));
+                    exportedIndex = i+1;
+                    continue;
+                } else if (character.unicode() == '\t') { // Tab
+                    //if (exportedIndex < i)
+                        writer.writeCharacters(fragmentText.mid(exportedIndex, i - exportedIndex));
+                    writer.writeEmptyElement(textNS, QString::fromLatin1("tab"));
+                    exportedIndex = i+1;
+                    precedingSpaces = 0;
+                } else if (isSpace) {
+                    ++precedingSpaces;
+                    escapeNextSpace = true;
+                } else if (!isSpace) {
+                    precedingSpaces = 0;
+                }
             }
-            if (!isSpace && !isTab)
-                precedingSpaces = 0;
         }
 
         writer.writeCharacters(fragmentText.mid(exportedIndex));
@@ -477,7 +472,7 @@ void QTextOdfWriter::writeBlockFormat(QXmlStreamWriter &writer, QTextBlockFormat
     if (format.hasProperty(QTextFormat::BlockRightMargin))
         writer.writeAttribute(foNS, QString::fromLatin1("margin-right"), pixelToPoint(qMax(qreal(0.), format.rightMargin())) );
     if (format.hasProperty(QTextFormat::TextIndent))
-        writer.writeAttribute(foNS, QString::fromLatin1("text-indent"), QString::number(format.textIndent()));
+        writer.writeAttribute(foNS, QString::fromLatin1("text-indent"), pixelToPoint(format.textIndent()));
     if (format.hasProperty(QTextFormat::PageBreakPolicy)) {
         if (format.pageBreakPolicy() & QTextFormat::PageBreak_AlwaysBefore)
             writer.writeAttribute(foNS, QString::fromLatin1("break-before"), QString::fromLatin1("page"));
author	Jason Barron <jbarron@trolltech.com>	2009-06-25 13:49:53 (GMT)
committer	Jason Barron <jbarron@trolltech.com>	2009-06-25 13:49:53 (GMT)
commit	db8f05e257019694f5e8076845626008f2adc3dd (patch)
tree	05d3959403cf15ac5f702091439e028af01f343b /src/gui/text
parent	8aafaa65a1d16f8b982279f5aceedf1e281ddb5a (diff)
parent	796a5a2c7d8c91a46ac761dde18b7da2ec6c177b (diff)
download	Qt-db8f05e257019694f5e8076845626008f2adc3dd.zip Qt-db8f05e257019694f5e8076845626008f2adc3dd.tar.gz Qt-db8f05e257019694f5e8076845626008f2adc3dd.tar.bz2