diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 19:48:40 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-03-28 19:48:40 (GMT) |
| commit | 7884b913c006402eded0bfe36053c9c557d8d9d6 (patch) | |
| tree | b04a541eedeeb71452a721a85292c20517ac2dd3 /tests | |
| parent | d31089f55c8a17d715ee22d420c57eea708a0652 (diff) | |
| parent | 5a6acc0ba1ed3b056f4c7a9c37481f4cb347a352 (diff) | |
| download | Qt-7884b913c006402eded0bfe36053c9c557d8d9d6.zip Qt-7884b913c006402eded0bfe36053c9c557d8d9d6.tar.gz Qt-7884b913c006402eded0bfe36053c9c557d8d9d6.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-s60-public:
Show softkeys when opening a dialog that has a fullscreen parent.
Fixed autotests on Windows.
QS60Style: draw QComboBox menu correctly
Remove two compilation warnings for ARM
QTabWidget tabs are resized in wrong way when device rotates
Symbian: QComboBox popup Listbox size is not adjusted
Switched back to using symlinks for all mkspecs on Linux.
QS60Style: Support for Menu separators
Native image handle provider support in QGLPixmapData
Fix an issue with VGImage readback in openvg.
QSysInfo support for next generation Symbian devices.
Call FixNativeOrientation on Symbian for certain fullscreen qml views.
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp index 5a2591f..2ce493b 100644 --- a/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp +++ b/tests/auto/declarative/qdeclarativelanguage/tst_qdeclarativelanguage.cpp @@ -174,7 +174,7 @@ private: QVERIFY(component.errors().isEmpty()); \ } else { \ QFile file(QLatin1String(SRCDIR) + QLatin1String("/data/") + QLatin1String(errorfile)); \ - QVERIFY(file.open(QIODevice::ReadOnly)); \ + QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); \ QByteArray data = file.readAll(); \ file.close(); \ QList<QByteArray> expected = data.split('\n'); \ diff --git a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp index dc104e2..9d1c609 100644 --- a/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp +++ b/tests/auto/declarative/qdeclarativemoduleplugin/tst_qdeclarativemoduleplugin.cpp @@ -85,7 +85,7 @@ private slots: QVERIFY(component.errors().isEmpty()); \ } else { \ QFile file(QLatin1String("data/") + QLatin1String(errorfile)); \ - QVERIFY(file.open(QIODevice::ReadOnly)); \ + QVERIFY(file.open(QIODevice::ReadOnly | QIODevice::Text)); \ QByteArray data = file.readAll(); \ file.close(); \ QList<QByteArray> expected = data.split('\n'); \ |