summaryrefslogtreecommitdiffstats
path: root/src/corelib/global/qglobal.h
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-04-17 11:24:09 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-04-17 11:24:09 (GMT)
commitfd36b47e8758562fc9ff350f292fc9ae9ed91d4e (patch)
tree139e2fc6ee4e1c52bb7f283250d5d72c58617a42 /src/corelib/global/qglobal.h
parent140a96d0b860b045c18d53c1ac96e77b3893d31c (diff)
parent0ab8fabe3d36f752ce7fdcc0d7e9fe9a4f03e928 (diff)
downloadQt-fd36b47e8758562fc9ff350f292fc9ae9ed91d4e.zip
Qt-fd36b47e8758562fc9ff350f292fc9ae9ed91d4e.tar.gz
Qt-fd36b47e8758562fc9ff350f292fc9ae9ed91d4e.tar.bz2
Merge branch 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration into 4.7-integration
* 'qt-4.7-from-4.6' of scm.dev.nokia.troll.no:qt/qt-integration: (50 commits) Fix mismatched import declarations Doc create magic comment messages in "finished" state make QT_TR_NOOP work in static initializers make HashString and HashStringList objects smaller remove pointless manual assignments from token type enum Update EABI and BWINS DEF files for Symbian Update WebKit DEF files on Symbian Add translation context to qsTr() benchmark QtScript: Add autotest for enumeration of QMetaObject properties Symbol visibility fixes for RVCT4 on Symbian Symbol visibility fixes for RVCT4 on Symbian Symbol visibility fixes for RVCT4 on Symbian Fixes auto-test failure for 9da13ea53aec6d841ba7f416531d6c52d4368df4. QNAM HTTP: Pipelining changes '#' gets inserted to editor when changing FEP modes ComboBox popuplist is not correctly layouted in fullscreen mode Dialogs in landscape mode are not correctly positioned Slider graphics does not look correct in N95 (part2) Fixes tooltips for QGraphicsProxyWidget. ...
Diffstat (limited to 'src/corelib/global/qglobal.h')
0 files changed, 0 insertions, 0 deletions