diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 16:15:01 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-01 16:15:01 (GMT) |
| commit | c272d672fc1863f9e3a201e93ad277c734749845 (patch) | |
| tree | 76676724c821878811841b817110438a52be820f /tests/auto/network-settings.h | |
| parent | 5fb8d729ddf56003af326ba4c9dbff56b57ed105 (diff) | |
| parent | 7c939ad26e2d79a5c72ace724dfa2a3be8e398b3 (diff) | |
| download | Qt-c272d672fc1863f9e3a201e93ad277c734749845.zip Qt-c272d672fc1863f9e3a201e93ad277c734749845.tar.gz Qt-c272d672fc1863f9e3a201e93ad277c734749845.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (67 commits)
Skip tst_QGraphicsItem::updateMicroFocus test on Windows and Mac as it does not passes
QScript: more missing APIShim
Fix compilation warnings
QScript: fix compilation warning
QScript: fix APIShim usage.
QtScript: remove duplicated APIshim in QScriptValueIterator
Attempt to fix the test.
Total makeover of SVG image reader
Add a QGraphicsItem::updateMicroFocus() to QGraphicsItem.
Micro optimization after feedback from Jan-Arve.
Show only one dialog when using QFileDialog on Mac.
Re-fix compilation: re-add symbols introduced in Qt 4.6.3 to Qt 4.7
Fix bad merge from 4.6.
Doc: Updated the qdoc manual with i18n info. Fixed a code example.
Fix QStaticText test on Mac
Support the pen set on the painter in QStaticText when using rich text
Fix setting font for QStaticText on Linux and Mac
Hack .pro files on windows to define QT_NO_EGL
Fix QDate::isLeapYear() for years < 1
One more test for chinese codecs
...
Diffstat (limited to 'tests/auto/network-settings.h')
0 files changed, 0 insertions, 0 deletions