diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-14 08:55:07 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-14 08:55:07 (GMT) |
| commit | f49e7fd8e13b6eb1844994a5368d0b1aa2ea6b22 (patch) | |
| tree | 88d63d32bb46c3ea10c018d76a9f910801ae7bac /src/corelib | |
| parent | bfe1b734cf138a05611666a6a4f351c52d825290 (diff) | |
| parent | 5bcb42d8f47f7206e9c0776b67a4c990ac93aa34 (diff) | |
| download | Qt-f49e7fd8e13b6eb1844994a5368d0b1aa2ea6b22.zip Qt-f49e7fd8e13b6eb1844994a5368d0b1aa2ea6b22.tar.gz Qt-f49e7fd8e13b6eb1844994a5368d0b1aa2ea6b22.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2: (43 commits)
tst_QGL: Skip all QGL test on mac as they crash and prevent integration
Skipped tst_QGL::replaceClipping on mac.
Skipped tst_QGL::glPBufferRendering on mac.
Skipped tst_QGL::glFBOUseInGLWidget on mac.
Skipped tst_QGL::graphicsViewClipping on mac.
Make QFontEngineGlyphCache explicitly shared
Small fix in iteviews for sizeHintForColumn/Row
Incorrect assertion in item views
Track the GL DCs we use across different threads under Windows.
Add copyright header
Avoid static local QHash
Remove explicit 'virtual' specifiers to conform to Qt coding standard
Use Q_ASSERT_X() rather than Q_ASSERT(!"message") idiom
Add eglnullws QScreen driver
Fixes the double spinbox not updating geometry when suffix is changed
Made QGL2GradientCache thread safe.
Add QItemSelectionRange::operator<()
Don't call GetDC() nedlessly.
Make QScriptAnalysis fit in two bytes again
QGLPixelBuffer should not rely on temporary QGLWidgets.
...
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 1 | ||||
| -rw-r--r-- | src/corelib/global/qnamespace.qdoc | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index a12e121..9ac6d68 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -530,6 +530,7 @@ public: AA_DontUseNativeMenuBar = 6, AA_MacDontSwapCtrlAndMeta = 7, AA_S60DontConstructApplicationPanes = 8, + AA_X11InitThreads = 9, // Add new attributes before this line AA_AttributeCount diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc index d419759..564164b 100644 --- a/src/corelib/global/qnamespace.qdoc +++ b/src/corelib/global/qnamespace.qdoc @@ -156,6 +156,11 @@ whole lifetime. This attribute must be set before QApplication is constructed. + \value AA_X11InitThreads Calls XInitThreads() as part of the QApplication + construction in order to make Xlib calls thread-safe. This + attribute must be set before QApplication is constructed. + + \omitvalue AA_AttributeCount */ |