diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-04 15:58:55 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2009-11-04 15:58:55 (GMT) |
| commit | 5ff97be22a5246c11851c2c6471a0b7ee2399425 (patch) | |
| tree | 4318dec329f4b3401184c9df80272c09e242bec3 /tests/auto/qtextscriptengine/generate/main.cpp | |
| parent | 0009fa533e4d5ca1a75ba3b56af082cdcfee55cc (diff) | |
| parent | 56b8d24c337d30c6bcdda101fbc664c4fd6d642d (diff) | |
| download | Qt-5ff97be22a5246c11851c2c6471a0b7ee2399425.zip Qt-5ff97be22a5246c11851c2c6471a0b7ee2399425.tar.gz Qt-5ff97be22a5246c11851c2c6471a0b7ee2399425.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tests/auto/qtextscriptengine/generate/main.cpp')
| -rw-r--r-- | tests/auto/qtextscriptengine/generate/main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qtextscriptengine/generate/main.cpp b/tests/auto/qtextscriptengine/generate/main.cpp index 853c726..15fbc47 100644 --- a/tests/auto/qtextscriptengine/generate/main.cpp +++ b/tests/auto/qtextscriptengine/generate/main.cpp @@ -40,7 +40,7 @@ ****************************************************************************/ -#include <QtTest/QtTest> +#include <QApplication> #include <QTextEdit> #include <QLineEdit> #include <QVBoxLayout> @@ -85,7 +85,7 @@ void MyEdit::setText(const QString &str) result += "0x" + QString::number(str.at(i).unicode(), 16) + ", "; result += "0x0 },\n { "; for (int i = 0; i < e->layoutData->items[0].num_glyphs; ++i) - result += "0x" + QString::number(e->layoutData->glyphPtr[i].glyph, 16) + ", "; + result += "0x" + QString::number(e->layoutData->glyphLayout.glyphs[i], 16) + ", "; result += "0x0 } }"; setPlainText(result); |