Revert part of commit 7c1ab9b6a8

It was not properly merged in master because of conflicts, and
we have now a public API for this

Added QEXPECT_FAIL and opened QTBUG-17325

1 files changed, 0 insertions, 23 deletions

diff --git a/src/declarative/graphicsitems/qdeclarativetext.cpp b/src/declarative/graphicsitems/qdeclarativetext.cpp
index 54b4c3a..346080d 100644
--- a/src/declarative/graphicsitems/qdeclarativetext.cpp
+++ b/src/declarative/graphicsitems/qdeclarativetext.cpp
@@ -41,7 +41,6 @@
 
 #include "private/qdeclarativetext_p.h"
 #include "private/qdeclarativetext_p_p.h"
-#include <private/qtextdocumentlayout_p.h>
 #include <qdeclarativestyledtext_p.h>
 #include <qdeclarativeinfo.h>
 #include <qdeclarativepixmapcache_p.h>
@@ -84,14 +83,6 @@ private:
     static QSet<QUrl> errors;
 };
 
-class QDeclarativeTextDocumentLayout : public QTextDocumentLayout
-{
-    Q_OBJECT
-public:
-    QDeclarativeTextDocumentLayout(QTextDocument *doc);
-    void setLineHeight(qreal lineHeight, QDeclarativeText::LineHeightMode mode);
-};
-
 DEFINE_BOOL_CONFIG_OPTION(enableImageCache, QML_ENABLE_TEXT_IMAGE_CACHE);
 
 QString QDeclarativeTextPrivate::elideChar = QString(0x2026);
@@ -185,15 +176,6 @@ void QTextDocumentWithImageResources::setText(const QString &text)
 
 QSet<QUrl> QTextDocumentWithImageResources::errors;
 
-QDeclarativeTextDocumentLayout::QDeclarativeTextDocumentLayout(QTextDocument *doc)
-    : QTextDocumentLayout(doc) {
-}
-
-void QDeclarativeTextDocumentLayout::setLineHeight(qreal lineHeight, QDeclarativeText::LineHeightMode mode = QDeclarativeText::MultiplyHeight)
-{
-    QTextDocumentLayout::setLineHeight(lineHeight, QTextDocumentLayout::LineHeightMode(mode));
-}
-
 QDeclarativeTextPrivate::~QDeclarativeTextPrivate()
 {
 }
@@ -239,11 +221,6 @@ void QDeclarativeTextPrivate::updateLayout()
             singleline = false;
             QDeclarativeStyledText::parse(text, layout);
         }
-    } else {
-        ensureDoc();
-        QDeclarativeTextDocumentLayout *layout = new QDeclarativeTextDocumentLayout(doc);
-        layout->setLineHeight(lineHeight, lineHeightMode);
-        doc->setDocumentLayout(layout);
     }
 
     updateSize();