summaryrefslogtreecommitdiffstats
path: root/tests/auto/qtextscriptengine/generate/main.cpp
diff options
context:
space:
mode:
authorJustin McPherson <justin.mcpherson@nokia.com>2010-01-15 05:35:55 (GMT)
committerJustin McPherson <justin.mcpherson@nokia.com>2010-01-15 05:35:55 (GMT)
commitd2fa5b80d4f40ac67a7a74552390332551563466 (patch)
tree1ef112b385dbbdd49abefd9b574573f7d21b69bf /tests/auto/qtextscriptengine/generate/main.cpp
parentf0d24ba1eaa1079abef3a1da641b43437dc7df66 (diff)
parent6c5c2312ca5477a1ec33f43c1673ab65a0dce8bb (diff)
downloadQt-d2fa5b80d4f40ac67a7a74552390332551563466.zip
Qt-d2fa5b80d4f40ac67a7a74552390332551563466.tar.gz
Qt-d2fa5b80d4f40ac67a7a74552390332551563466.tar.bz2
Merge branch 'master' of ../../qt/master
Conflicts: examples/multimedia/audioinput/audioinput.cpp src/multimedia/audio/qaudiodeviceinfo.cpp src/multimedia/audio/qaudiodeviceinfo_win32_p.cpp src/multimedia/audio/qaudioformat.cpp src/multimedia/audio/qaudioinput_win32_p.cpp src/multimedia/audio/qaudiooutput_win32_p.cpp tests/auto/qaudioformat/tst_qaudioformat.cpp
Diffstat (limited to 'tests/auto/qtextscriptengine/generate/main.cpp')
-rw-r--r--tests/auto/qtextscriptengine/generate/main.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qtextscriptengine/generate/main.cpp b/tests/auto/qtextscriptengine/generate/main.cpp
index 853c726..0b764f2 100644
--- a/tests/auto/qtextscriptengine/generate/main.cpp
+++ b/tests/auto/qtextscriptengine/generate/main.cpp
@@ -1,6 +1,6 @@
/****************************************************************************
**
-** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
** All rights reserved.
** Contact: Nokia Corporation (qt-info@nokia.com)
**
@@ -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);